From bf4cfc22e89bc4db946fa801ddc8b7a61a763133 Mon Sep 17 00:00:00 2001
From: Alex Brasetvik <alex@brasetvik.com>
Date: Fri, 28 Nov 2014 18:58:37 +0100
Subject: [PATCH 01/57] Support connecting to Elasticsearch protected with
 basic auth

---
 src/server/config/kibana.yml | 8 ++++++++
 src/server/routes/proxy.rb   | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/server/config/kibana.yml b/src/server/config/kibana.yml
index c4e1d8345973..fc9a6ec42e3b 100644
--- a/src/server/config/kibana.yml
+++ b/src/server/config/kibana.yml
@@ -7,6 +7,14 @@ host: "0.0.0.0"
 # The Elasticsearch instance to use for all your queries.
 elasticsearch: "http://localhost:9200"
 
+# If your Elasticsearch is protected with basic auth:
+# username: user
+# password: pass
+
+# preserve_elasticsearch_host true will send the hostname specified in `elasticsearch`. If you set it to false,
+# then the host you use to connect to *this* Kibana instance will be sent.
+preserve_elasticsearch_host: true
+
 # Kibana uses an index in Elasticsearch to store saved searches, visualizations
 # and dashboards. It will create a new index if it doesn't already exist.
 kibanaIndex: ".kibana"
diff --git a/src/server/routes/proxy.rb b/src/server/routes/proxy.rb
index f9fb1090db19..5ad20b8c6603 100644
--- a/src/server/routes/proxy.rb
+++ b/src/server/routes/proxy.rb
@@ -9,7 +9,7 @@ class Proxy < Base
       use Rack::ReverseProxy do
         reverse_proxy_options timeout: config["request_timeout"]
         @global_options[:verify_ssl] = config["verifySSL"].nil? ? true : config["verifySSL"]
-        reverse_proxy(/^\/elasticsearch(.*)$/, "#{config["elasticsearch"]}$1")
+        reverse_proxy(/^\/elasticsearch(.*)$/, "#{config["elasticsearch"]}$1", username: config["username"], password: config["password"], preserve_host: config["preserve_elasticsearch_host"])
       end
     end
   end

From fcbd3f42c7a6071ac2c919d4145058424e2fbef1 Mon Sep 17 00:00:00 2001
From: Alex Brasetvik <alex@brasetvik.com>
Date: Sat, 29 Nov 2014 08:52:23 +0100
Subject: [PATCH 02/57] Do not expose credentials through /config

---
 src/server/routes/home.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/server/routes/home.rb b/src/server/routes/home.rb
index df4216bea52e..18b078e0409f 100644
--- a/src/server/routes/home.rb
+++ b/src/server/routes/home.rb
@@ -14,7 +14,9 @@ class Home < Base
         data = settings.config.clone()
         plugins = external_plugins.concat(bundled_plugins)
         data['plugins'] = plugins
-        data.delete('elasticsearch')
+
+        # Remove keys we do not want to expose
+        ["elasticsearch", "username", "password"].each { |key| data.delete(key) }
 
         json data
       end

From f1de40ccf7be4817ce79a2d32fe4fda3234907bc Mon Sep 17 00:00:00 2001
From: Alex Brasetvik <alex@brasetvik.com>
Date: Mon, 1 Dec 2014 21:36:24 +0100
Subject: [PATCH 03/57] Prefix username/password with elasticsearch_

---
 src/server/config/kibana.yml | 4 ++--
 src/server/routes/home.rb    | 2 +-
 src/server/routes/proxy.rb   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/server/config/kibana.yml b/src/server/config/kibana.yml
index fc9a6ec42e3b..8e32bfa8ecca 100644
--- a/src/server/config/kibana.yml
+++ b/src/server/config/kibana.yml
@@ -8,8 +8,8 @@ host: "0.0.0.0"
 elasticsearch: "http://localhost:9200"
 
 # If your Elasticsearch is protected with basic auth:
-# username: user
-# password: pass
+# elasticsearch_username: user
+# elasticsearch_password: pass
 
 # preserve_elasticsearch_host true will send the hostname specified in `elasticsearch`. If you set it to false,
 # then the host you use to connect to *this* Kibana instance will be sent.
diff --git a/src/server/routes/home.rb b/src/server/routes/home.rb
index 18b078e0409f..8846da7185bb 100644
--- a/src/server/routes/home.rb
+++ b/src/server/routes/home.rb
@@ -16,7 +16,7 @@ class Home < Base
         data['plugins'] = plugins
 
         # Remove keys we do not want to expose
-        ["elasticsearch", "username", "password"].each { |key| data.delete(key) }
+        ["elasticsearch", "elasticsearch_username", "elasticsearch_password"].each { |key| data.delete(key) }
 
         json data
       end
diff --git a/src/server/routes/proxy.rb b/src/server/routes/proxy.rb
index 5ad20b8c6603..5dd35d6f5467 100644
--- a/src/server/routes/proxy.rb
+++ b/src/server/routes/proxy.rb
@@ -9,7 +9,7 @@ class Proxy < Base
       use Rack::ReverseProxy do
         reverse_proxy_options timeout: config["request_timeout"]
         @global_options[:verify_ssl] = config["verifySSL"].nil? ? true : config["verifySSL"]
-        reverse_proxy(/^\/elasticsearch(.*)$/, "#{config["elasticsearch"]}$1", username: config["username"], password: config["password"], preserve_host: config["preserve_elasticsearch_host"])
+        reverse_proxy(/^\/elasticsearch(.*)$/, "#{config["elasticsearch"]}$1", username: config["elasticsearch_username"], password: config["elasticsearch_password"], preserve_host: config["preserve_elasticsearch_host"])
       end
     end
   end

From aba90184d99aa474dcc1811645363043a88a9dcf Mon Sep 17 00:00:00 2001
From: Alex Brasetvik <alex@brasetvik.com>
Date: Mon, 1 Dec 2014 21:37:05 +0100
Subject: [PATCH 04/57] Break long line

---
 src/server/routes/proxy.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/server/routes/proxy.rb b/src/server/routes/proxy.rb
index 5dd35d6f5467..e5aaa5f2c821 100644
--- a/src/server/routes/proxy.rb
+++ b/src/server/routes/proxy.rb
@@ -9,7 +9,10 @@ class Proxy < Base
       use Rack::ReverseProxy do
         reverse_proxy_options timeout: config["request_timeout"]
         @global_options[:verify_ssl] = config["verifySSL"].nil? ? true : config["verifySSL"]
-        reverse_proxy(/^\/elasticsearch(.*)$/, "#{config["elasticsearch"]}$1", username: config["elasticsearch_username"], password: config["elasticsearch_password"], preserve_host: config["preserve_elasticsearch_host"])
+        reverse_proxy(/^\/elasticsearch(.*)$/, "#{config["elasticsearch"]}$1",
+            username: config["elasticsearch_username"],
+            password: config["elasticsearch_password"],
+            preserve_host: config["preserve_elasticsearch_host"])
       end
     end
   end

From 2ed9f358f6f19d8bb941d1ba810340bd47a46701 Mon Sep 17 00:00:00 2001
From: Thibaut Marmin <marminthibaut@users.noreply.github.com>
Date: Wed, 3 Dec 2014 18:05:40 +0100
Subject: [PATCH 05/57] Use relative paths instead of absolute Closes #1630

---
 src/kibana/index.html             | 8 ++++----
 src/kibana/styles/_variables.less | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/kibana/index.html b/src/kibana/index.html
index bd71139bc3c9..19c224b4cda1 100644
--- a/src/kibana/index.html
+++ b/src/kibana/index.html
@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width">
-    <link rel="shortcut icon" href="/styles/theme/elk.ico">
+    <link rel="shortcut icon" href="styles/theme/elk.ico">
     <title>Kibana 4</title>
 
     <script>
@@ -14,9 +14,9 @@
       window.KIBANA_COMMIT_SHA='@@commitSha';
     </script>
 
-    <link rel="stylesheet" href="/styles/main.css?_b=@@buildNum">
-    <script src="/bower_components/requirejs/require.js?_b=@@buildNum"></script>
-    <script src="/require.config.js?_b=@@buildNum"></script>
+    <link rel="stylesheet" href="styles/main.css?_b=@@buildNum">
+    <script src="bower_components/requirejs/require.js?_b=@@buildNum"></script>
+    <script src="require.config.js?_b=@@buildNum"></script>
     <script>
       if (window.KIBANA_BUILD_NUM.substr(0, 2) !== '@@') {
         // only cache bust if this is really the build number
diff --git a/src/kibana/styles/_variables.less b/src/kibana/styles/_variables.less
index 9298ecca123a..ea45a1013001 100644
--- a/src/kibana/styles/_variables.less
+++ b/src/kibana/styles/_variables.less
@@ -1,4 +1,4 @@
-@fa-font-path: "../../bower_components/font-awesome/fonts";
+@fa-font-path: "../bower_components/font-awesome/fonts";
 @font-size-smaller: ceil((@font-size-base * 0.75));
 
 //** input boxes get a slick border thanks to flatly, this controls it's size
@@ -19,4 +19,4 @@
 @sidebar-active-hover-color: @component-active-color;
 
 @action-add: desaturate(@btn-success-bg, 30%);
-@action-remove: desaturate(@btn-danger-bg, 30%);
\ No newline at end of file
+@action-remove: desaturate(@btn-danger-bg, 30%);

From cfd4f01b9cfa1b23f66f940b0ca4f329ac9369fe Mon Sep 17 00:00:00 2001
From: Alex Brasetvik <alex@brasetvik.com>
Date: Fri, 5 Dec 2014 20:59:21 +0100
Subject: [PATCH 06/57] elasticsearch_ prefix consistency

---
 src/server/config/kibana.yml | 2 +-
 src/server/routes/proxy.rb   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/server/config/kibana.yml b/src/server/config/kibana.yml
index 8e32bfa8ecca..481c9e5c54ca 100644
--- a/src/server/config/kibana.yml
+++ b/src/server/config/kibana.yml
@@ -13,7 +13,7 @@ elasticsearch: "http://localhost:9200"
 
 # preserve_elasticsearch_host true will send the hostname specified in `elasticsearch`. If you set it to false,
 # then the host you use to connect to *this* Kibana instance will be sent.
-preserve_elasticsearch_host: true
+elasticsearch_preserve_host: true
 
 # Kibana uses an index in Elasticsearch to store saved searches, visualizations
 # and dashboards. It will create a new index if it doesn't already exist.
diff --git a/src/server/routes/proxy.rb b/src/server/routes/proxy.rb
index e5aaa5f2c821..894322104166 100644
--- a/src/server/routes/proxy.rb
+++ b/src/server/routes/proxy.rb
@@ -12,7 +12,7 @@ class Proxy < Base
         reverse_proxy(/^\/elasticsearch(.*)$/, "#{config["elasticsearch"]}$1",
             username: config["elasticsearch_username"],
             password: config["elasticsearch_password"],
-            preserve_host: config["preserve_elasticsearch_host"])
+            preserve_host: config["elasticsearch_preserve_host"])
       end
     end
   end

From 59a5eb17f218f57f7c8cd966b99c17e86d05eefa Mon Sep 17 00:00:00 2001
From: Alex Brasetvik <alex@brasetvik.com>
Date: Fri, 5 Dec 2014 22:27:21 +0100
Subject: [PATCH 07/57] Default elasticsearch_preserve_host to true if omitted

---
 src/server/routes/proxy.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/routes/proxy.rb b/src/server/routes/proxy.rb
index e74445d5752f..11d00092f802 100644
--- a/src/server/routes/proxy.rb
+++ b/src/server/routes/proxy.rb
@@ -12,7 +12,7 @@ class Proxy < Base
         reverse_proxy(/^\/elasticsearch(.*)$/, "#{config["elasticsearch"]}$1",
             username: config["elasticsearch_username"],
             password: config["elasticsearch_password"],
-            preserve_host: config["elasticsearch_preserve_host"])
+            preserve_host: config["elasticsearch_preserve_host"].nil? ? true : config["elasticsearch_preserve_host"])
       end
     end
   end

From 7a1644c59fea8fd4665b52d71f7c4f2c0681b795 Mon Sep 17 00:00:00 2001
From: mgolinelli <marc.golinelli@gmail.com>
Date: Wed, 17 Dec 2014 08:22:36 +0100
Subject: [PATCH 08/57] Update get_build_props.js

Used git rev-parse HEAD to pick out and massage parameters
---
 tasks/get_build_props.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tasks/get_build_props.js b/tasks/get_build_props.js
index ec809ab3eaaa..242e8afe1b0c 100644
--- a/tasks/get_build_props.js
+++ b/tasks/get_build_props.js
@@ -4,7 +4,7 @@ module.exports = function (grunt) {
 
   grunt.registerTask('get_build_props', function () {
     Promise.props({
-      sha: spawn.silent('git', ['log', '--format=%H', '-n1'])(),
+      sha: spawn.silent('git', ['rev-parse', 'HEAD'])(),
       num: spawn.silent('sh', ['-c', 'git log --format="%h" | wc -l'])()
     })
     .then(function (props) {
@@ -13,4 +13,4 @@ module.exports = function (grunt) {
     })
     .nodeify(this.async());
   });
-};
\ No newline at end of file
+};

From bef2b8edadbe0941927f8d16967e27c0aa2f0b48 Mon Sep 17 00:00:00 2001
From: Rashid Khan <rashidkpc@gmail.com>
Date: Wed, 17 Dec 2014 08:33:40 -0700
Subject: [PATCH 09/57] Use fielddata_fields instead of a script to get the
 long. Closes #2362

---
 .../components/courier/data_source/_abstract.js    |  3 +++
 .../index_patterns/_get_computed_fields.js         | 14 +++++---------
 src/kibana/plugins/doc/controllers/doc.js          |  3 ++-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/kibana/components/courier/data_source/_abstract.js b/src/kibana/components/courier/data_source/_abstract.js
index a9f6502a6736..9a4dfcfdd07e 100644
--- a/src/kibana/components/courier/data_source/_abstract.js
+++ b/src/kibana/components/courier/data_source/_abstract.js
@@ -269,7 +269,10 @@ define(function (require) {
           var computedFields = flatState.index.getComputedFields();
           flatState.body.fields = computedFields.fields;
           flatState.body.script_fields = flatState.body.script_fields || {};
+          flatState.body.fielddata_fields = flatState.body.fielddata_fields || [];
+
           _.extend(flatState.body.script_fields, computedFields.scriptFields);
+          flatState.body.fielddata_fields = _.union(flatState.body.fielddata_fields, computedFields.fielddataFields);
 
 
           /**
diff --git a/src/kibana/components/index_patterns/_get_computed_fields.js b/src/kibana/components/index_patterns/_get_computed_fields.js
index ae42ecd4dd50..1a2539d4f5d5 100644
--- a/src/kibana/components/index_patterns/_get_computed_fields.js
+++ b/src/kibana/components/index_patterns/_get_computed_fields.js
@@ -5,14 +5,9 @@ define(function (require) {
   return function () {
     var self = this;
     var scriptFields = {};
+    var fielddataFields = [];
 
-    _.each(self.fields.byType['date'], function (field) {
-      if (field.indexed) {
-        scriptFields[field.name] = {
-          script: 'if (doc["' + field.name + '"].value == 0) { null } else { doc["' + field.name + '"].value }'
-        };
-      }
-    });
+    fielddataFields = _.pluck(self.fields.byType['date'], 'name');
 
     _.each(self.getFields('scripted'), function (field) {
       scriptFields[field.name] = { script: field.script };
@@ -20,8 +15,9 @@ define(function (require) {
 
     return {
       fields: ['*', '_source'],
-      scriptFields: scriptFields
+      scriptFields: scriptFields,
+      fielddataFields: fielddataFields
     };
 
   };
-});
+});
\ No newline at end of file
diff --git a/src/kibana/plugins/doc/controllers/doc.js b/src/kibana/plugins/doc/controllers/doc.js
index f40f4d427cbd..b9090c7af1c8 100644
--- a/src/kibana/plugins/doc/controllers/doc.js
+++ b/src/kibana/plugins/doc/controllers/doc.js
@@ -42,7 +42,8 @@ define(function (require) {
           }
         },
         fields: computedFields.fields,
-        script_fields: computedFields.scriptFields
+        script_fields: computedFields.scriptFields,
+        fielddata_fields: computedFields.fielddataFields
       }
     }).then(function (resp) {
       if (resp.hits) {

From 8e7e62344b954194bfcb57b15d49e3c153cca1c7 Mon Sep 17 00:00:00 2001
From: Rashid Khan <rashidkpc@gmail.com>
Date: Wed, 17 Dec 2014 08:45:58 -0700
Subject: [PATCH 10/57] Changes tests to look at fielddataFields

---
 .../specs/components/index_pattern/_get_computed_fields.js  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/unit/specs/components/index_pattern/_get_computed_fields.js b/test/unit/specs/components/index_pattern/_get_computed_fields.js
index 8a41da9eced7..b9deeaa40d96 100644
--- a/test/unit/specs/components/index_pattern/_get_computed_fields.js
+++ b/test/unit/specs/components/index_pattern/_get_computed_fields.js
@@ -24,9 +24,9 @@ define(function (require) {
       expect(fn().fields).to.contain('_source');
     });
 
-    it('should request date fields as scripts', function () {
-      expect(fn().scriptFields).to.include.keys('@timestamp');
-      expect(fn().scriptFields).to.not.include.keys('bytes');
+    it('should request date fields as fielddata_fields', function () {
+      expect(fn().fielddataFields).to.contain('@timestamp');
+      expect(fn().fielddataFields).to.not.include.keys('bytes');
     });
 
 

From 6124c3b3773fa1706a86940d2b6e7540380fb366 Mon Sep 17 00:00:00 2001
From: Joe Fleming <joe.fleming@gmail.com>
Date: Wed, 17 Dec 2014 11:33:20 -0700
Subject: [PATCH 11/57] fixes some spots we're still using camel case

---
 Gruntfile.js              | 2 +-
 src/server/routes/base.rb | 2 +-
 tasks/config/requirejs.js | 2 +-
 tasks/plugins.js          | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index bf8edf306270..e3c914fb3929 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -43,7 +43,7 @@ module.exports = function (grunt) {
     return 'plugins/' + dirname(fileName) + '/index';
   });
 
-  config.bundledPluginModuleIds = grunt.bundledPluginModuleIds = moduleIds;
+  config.bundled_plugin_module_ids = grunt.bundled_plugin_module_ids = moduleIds;
 
   // load plugins
   require('load-grunt-config')(grunt, {
diff --git a/src/server/routes/base.rb b/src/server/routes/base.rb
index bd3341fed362..71bfb9cca6d9 100644
--- a/src/server/routes/base.rb
+++ b/src/server/routes/base.rb
@@ -23,7 +23,7 @@ class Base < Sinatra::Base
         set :external_plugins_folder, Kibana.global_settings[:external_plugins_folder]
         set :httponly, true
         set :config, config
-        set :bundled_plugin_ids, config['bundledPluginIds'] || []
+        set :bundled_plugin_ids, config['bundled_plugin_ids'] || []
 
         set :show_exceptions, false
         set :raise_errors, false
diff --git a/tasks/config/requirejs.js b/tasks/config/requirejs.js
index 7b873a481b99..9c10dbb74466 100644
--- a/tasks/config/requirejs.js
+++ b/tasks/config/requirejs.js
@@ -59,7 +59,7 @@ module.exports = function (grunt) {
 
   // include bundled plugins in the build
   var main = config.build.options.modules[0];
-  grunt.bundledPluginModuleIds.forEach(function (moduleId) {
+  grunt.bundled_plugin_module_ids.forEach(function (moduleId) {
     main.include.push(moduleId);
   });
 
diff --git a/tasks/plugins.js b/tasks/plugins.js
index 181b66cb0b57..56049bd109b7 100644
--- a/tasks/plugins.js
+++ b/tasks/plugins.js
@@ -5,9 +5,9 @@ module.exports = function (grunt) {
   });
 
   grunt.registerTask('describe_bundled_plugins', function () {
-    var configKey = 'bundledPluginIds';
+    var configKey = 'bundled_plugin_ids';
     var file = grunt.config.process('<%= build %>/dist/kibana/config/kibana.yml');
-    var idList = grunt.config.get('bundledPluginModuleIds').map(function (id) {
+    var idList = grunt.config.get('bundled_plugin_module_ids').map(function (id) {
       return ' - ' + id;
     }).join('\n');
 

From ae291277884a8726c1387988b8529cecb61d2280 Mon Sep 17 00:00:00 2001
From: Rashid Khan <rashidkpc@gmail.com>
Date: Wed, 17 Dec 2014 13:41:57 -0700
Subject: [PATCH 12/57] Add maxPrecision configuration parameter. Closes #2372

---
 src/kibana/components/agg_types/controls/precision.html | 2 +-
 src/kibana/components/config/defaults.js                | 4 ++++
 src/kibana/plugins/visualize/editor/agg_param.js        | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/kibana/components/agg_types/controls/precision.html b/src/kibana/components/agg_types/controls/precision.html
index 0cc2cf4e90e0..dd5e108a00a3 100644
--- a/src/kibana/components/agg_types/controls/precision.html
+++ b/src/kibana/components/agg_types/controls/precision.html
@@ -9,7 +9,7 @@
         class="form-control"
         type="range"
         min="1"
-        max="9"
+        max="{{config.get('visualization:tileMap:maxPrecision')}}"
         >
       <div class="form-group vis-editor-agg-form-value">
         {{params.precision}}
diff --git a/src/kibana/components/config/defaults.js b/src/kibana/components/config/defaults.js
index ba3ca50d2504..c21fa068e482 100644
--- a/src/kibana/components/config/defaults.js
+++ b/src/kibana/components/config/defaults.js
@@ -30,6 +30,10 @@ define(function (require) {
       value: 100,
       description: 'Never show more than this many bar in date histograms, scale values if needed',
     },
+    'visualization:tileMap:maxPrecision': {
+      value: 6,
+      description: 'The maximum geoHash size allowed in a tile map',
+    },
     'csv:separator': {
       value: ',',
       description: 'Separate exported values with this string',
diff --git a/src/kibana/plugins/visualize/editor/agg_param.js b/src/kibana/plugins/visualize/editor/agg_param.js
index 49b4744b9fad..1ac37e52cf13 100644
--- a/src/kibana/plugins/visualize/editor/agg_param.js
+++ b/src/kibana/plugins/visualize/editor/agg_param.js
@@ -3,7 +3,7 @@ define(function (require) {
 
   require('modules')
   .get('app/visualize')
-  .directive('visAggParamEditor', function () {
+  .directive('visAggParamEditor', function (config) {
     return {
       restrict: 'E',
       scope: {
@@ -16,6 +16,7 @@ define(function (require) {
         return $el.html();
       },
       link: function ($scope) {
+        $scope.config = config;
         $scope.optionEnabled = function (option) {
           if (option && _.isFunction(option.enabled)) {
             return option.enabled($scope.aggConfig);

From 6c2ac8b4e3250e3e110392e3ede57694ed77505e Mon Sep 17 00:00:00 2001
From: lukasolson <olson.lukas@gmail.com>
Date: Wed, 17 Dec 2014 14:57:09 -0700
Subject: [PATCH 13/57] Index name pattern validation directive

---
 src/kibana/directives/validate_index_name.js  |  41 ++++++
 .../settings/sections/indices/_create.html    |   5 +-
 .../settings/sections/indices/_create.js      |   2 +
 .../specs/directives/validate_index_name.js   | 137 ++++++++++++++++++
 4 files changed, 184 insertions(+), 1 deletion(-)
 create mode 100644 src/kibana/directives/validate_index_name.js
 create mode 100644 test/unit/specs/directives/validate_index_name.js

diff --git a/src/kibana/directives/validate_index_name.js b/src/kibana/directives/validate_index_name.js
new file mode 100644
index 000000000000..50e7ffae7504
--- /dev/null
+++ b/src/kibana/directives/validate_index_name.js
@@ -0,0 +1,41 @@
+// See https://github.com/elasticsearch/elasticsearch/issues/6736
+define(function (require) {
+  var _ = require('lodash');
+
+  require('modules')
+    .get('kibana')
+    .directive('validateIndexName', function () {
+      return {
+        restrict: 'A',
+        require: 'ngModel',
+        scope: {
+          'ngModel': '='
+        },
+        link: function ($scope, elem, attr, ngModel) {
+          var illegalCharacters = ['\\', '/', '?', '"', '<', '>', '|', ' ', ','];
+          var isValid = function (input) {
+            if (input == null || input === '' || input === '.' || input === '..') return false;
+
+            var match = _.find(illegalCharacters, function (character) {
+              return input.indexOf(character) >= 0;
+            });
+            return !match;
+          };
+
+          // From User
+          ngModel.$parsers.unshift(function (value) {
+            var valid = isValid(value);
+            ngModel.$setValidity('indexNameInput', valid);
+            return valid ? value : undefined;
+          });
+
+          // To user
+          ngModel.$formatters.unshift(function (value) {
+            ngModel.$setValidity('indexNameInput', isValid(value));
+            return value;
+          });
+
+        }
+      };
+    });
+});
\ No newline at end of file
diff --git a/src/kibana/plugins/settings/sections/indices/_create.html b/src/kibana/plugins/settings/sections/indices/_create.html
index 1a9fae3f5106..1a0cb44c6005 100644
--- a/src/kibana/plugins/settings/sections/indices/_create.html
+++ b/src/kibana/plugins/settings/sections/indices/_create.html
@@ -33,6 +33,8 @@ <h1>Configure an index pattern</h1>
               ng-model="index.name"
               ng-attr-placeholder="{{index.defaultName}}"
               ng-model-options="{ updateOn: 'default blur', debounce: {'default': 2500, 'blur': 0} }"
+              validate-index-name
+              name="name"
               required
               type="text"
               class="form-control">
@@ -116,7 +118,8 @@ <h1>Configure an index pattern</h1>
             ng-class="index.fetchFieldsError ? 'btn-default' : 'btn-success'"
             type="submit"
             class="btn">
-            {{index.fetchFieldsError || "Create" }}
+            <span ng-hide="form.name.$error.indexNameInput">{{index.fetchFieldsError || "Create" }}</span>
+            <span ng-show="form.name.$error.indexNameInput">Invalid index name pattern.</span>
           </button>
         </form>
       </div>
diff --git a/src/kibana/plugins/settings/sections/indices/_create.js b/src/kibana/plugins/settings/sections/indices/_create.js
index a714b93462a8..d094cfd3149e 100644
--- a/src/kibana/plugins/settings/sections/indices/_create.js
+++ b/src/kibana/plugins/settings/sections/indices/_create.js
@@ -3,6 +3,8 @@ define(function (require) {
   var moment = require('moment');
   var errors = require('errors');
 
+  require('directives/validate_index_name');
+
   require('routes')
   .when('/settings/indices/', {
     template: require('text!plugins/settings/sections/indices/_create.html')
diff --git a/test/unit/specs/directives/validate_index_name.js b/test/unit/specs/directives/validate_index_name.js
new file mode 100644
index 000000000000..c73b89f484cc
--- /dev/null
+++ b/test/unit/specs/directives/validate_index_name.js
@@ -0,0 +1,137 @@
+define(function (require) {
+  var angular = require('angular');
+
+  // Load the kibana app dependencies.
+  require('directives/validate_index_name');
+
+  describe('Validate index name directive', function () {
+    var $compile, $rootScope;
+    var html = '<input type="text" ng-model="indexName" validate-index-name />';
+
+    beforeEach(module('kibana'));
+
+    beforeEach(inject(function (_$compile_, _$rootScope_) {
+      $compile = _$compile_;
+      $rootScope = _$rootScope_;
+    }));
+
+    it('should not accept null index name patterns', function () {
+      $rootScope.indexName = null;
+      var element = $compile(html)($rootScope);
+      $rootScope.$digest();
+      expect(element.hasClass('ng-invalid')).to.be.ok();
+    });
+
+    it('should not accept undefined index name patterns', function () {
+      $rootScope.indexName = undefined;
+      var element = $compile(html)($rootScope);
+      $rootScope.$digest();
+      expect(element.hasClass('ng-invalid')).to.be.ok();
+    });
+
+    it('should not accept empty index name patterns', function () {
+      $rootScope.indexName = '';
+      var element = $compile(html)($rootScope);
+      $rootScope.$digest();
+      expect(element.hasClass('ng-invalid')).to.be.ok();
+    });
+
+    it('should not accept . as an index name pattern', function () {
+      $rootScope.indexName = '.';
+      var element = $compile(html)($rootScope);
+      $rootScope.$digest();
+      expect(element.hasClass('ng-invalid')).to.be.ok();
+    });
+
+    it('should not accept .. as an index name pattern', function () {
+      $rootScope.indexName = '..';
+      var element = $compile(html)($rootScope);
+      $rootScope.$digest();
+      expect(element.hasClass('ng-invalid')).to.be.ok();
+    });
+
+    it('should not accept \\ in an index name pattern', function () {
+      $rootScope.indexName = 'foo\\bar';
+      var element = $compile(html)($rootScope);
+      $rootScope.$digest();
+      expect(element.hasClass('ng-invalid')).to.be.ok();
+    });
+
+    it('should not accept / in an index name pattern', function () {
+      $rootScope.indexName = 'foo/bar';
+      var element = $compile(html)($rootScope);
+      $rootScope.$digest();
+      expect(element.hasClass('ng-invalid')).to.be.ok();
+    });
+
+    it('should not accept ? in an index name pattern', function () {
+      $rootScope.indexName = 'foo?bar';
+      var element = $compile(html)($rootScope);
+      $rootScope.$digest();
+      expect(element.hasClass('ng-invalid')).to.be.ok();
+    });
+
+    it('should not accept " in an index name pattern', function () {
+      $rootScope.indexName = 'foo"bar';
+      var element = $compile(html)($rootScope);
+      $rootScope.$digest();
+      expect(element.hasClass('ng-invalid')).to.be.ok();
+    });
+
+    it('should not accept < in an index name pattern', function () {
+      $rootScope.indexName = 'foo<bar';
+      var element = $compile(html)($rootScope);
+      $rootScope.$digest();
+      expect(element.hasClass('ng-invalid')).to.be.ok();
+    });
+
+    it('should not accept > in an index name pattern', function () {
+      $rootScope.indexName = 'foo>bar';
+      var element = $compile(html)($rootScope);
+      $rootScope.$digest();
+      expect(element.hasClass('ng-invalid')).to.be.ok();
+    });
+
+    it('should not accept | in an index name pattern', function () {
+      $rootScope.indexName = 'foo|bar';
+      var element = $compile(html)($rootScope);
+      $rootScope.$digest();
+      expect(element.hasClass('ng-invalid')).to.be.ok();
+    });
+
+    it('should not accept spaces in an index name pattern', function () {
+      $rootScope.indexName = 'foo bar';
+      var element = $compile(html)($rootScope);
+      $rootScope.$digest();
+      expect(element.hasClass('ng-invalid')).to.be.ok();
+    });
+
+    it('should not accept , in an index name pattern', function () {
+      $rootScope.indexName = 'foo,bar';
+      var element = $compile(html)($rootScope);
+      $rootScope.$digest();
+      expect(element.hasClass('ng-invalid')).to.be.ok();
+    });
+
+    it('should accept a valid index name pattern', function () {
+      $rootScope.indexName = 'foo.bar';
+      var element = $compile(html)($rootScope);
+      $rootScope.$digest();
+      expect(element.hasClass('ng-invalid')).to.not.be.ok();
+    });
+
+    it('should accept * in an index name pattern', function () {
+      $rootScope.indexName = 'foo.*';
+      var element = $compile(html)($rootScope);
+      $rootScope.$digest();
+      expect(element.hasClass('ng-invalid')).to.not.be.ok();
+    });
+
+    it('should accept [] in an index name pattern', function () {
+      $rootScope.indexName = '[foo]-YYYY.MM.DD';
+      var element = $compile(html)($rootScope);
+      $rootScope.$digest();
+      expect(element.hasClass('ng-invalid')).to.not.be.ok();
+    });
+  });
+});
\ No newline at end of file

From 957d8a208a6eff617d982e3785be397fd090bf24 Mon Sep 17 00:00:00 2001
From: Rashid Khan <rashidkpc@gmail.com>
Date: Wed, 17 Dec 2014 15:32:44 -0700
Subject: [PATCH 14/57] Set example index pattern based on interval, select
 Daily by default, add warning about weekly. Closes #2364

---
 .../components/index_patterns/_intervals.js   | 48 ++++++++-------
 .../settings/sections/indices/_create.html    | 33 ++++++----
 .../settings/sections/indices/_create.js      | 60 +++++++++++++------
 3 files changed, 87 insertions(+), 54 deletions(-)

diff --git a/src/kibana/components/index_patterns/_intervals.js b/src/kibana/components/index_patterns/_intervals.js
index 67b527b74c57..3ccad60a941e 100644
--- a/src/kibana/components/index_patterns/_intervals.js
+++ b/src/kibana/components/index_patterns/_intervals.js
@@ -2,29 +2,33 @@ define(function (require) {
   return function IndexNameIntervalsService(timefilter) {
     var _ = require('lodash');
     var moment = require('moment');
+    var IndexedArray = require('utils/indexed_array/index');
 
-    var intervals = [
-      {
-        name: 'hours',
-        display: 'Hourly'
-      },
-      {
-        name: 'days',
-        display: 'Daily'
-      },
-      {
-        name: 'weeks',
-        display: 'Weekly'
-      },
-      {
-        name: 'months',
-        display: 'Monthly'
-      },
-      {
-        name: 'years',
-        display: 'Yearly'
-      }
-    ];
+    var intervals = new IndexedArray({
+      index: ['name'],
+      initialSet: [
+        {
+          name: 'hours',
+          display: 'Hourly'
+        },
+        {
+          name: 'days',
+          display: 'Daily'
+        },
+        {
+          name: 'weeks',
+          display: 'Weekly'
+        },
+        {
+          name: 'months',
+          display: 'Monthly'
+        },
+        {
+          name: 'years',
+          display: 'Yearly'
+        }
+      ]
+    });
 
     intervals.toIndexList = function (format, interval, a, b) {
       var bounds;
diff --git a/src/kibana/plugins/settings/sections/indices/_create.html b/src/kibana/plugins/settings/sections/indices/_create.html
index 1a9fae3f5106..ce948a49c6a7 100644
--- a/src/kibana/plugins/settings/sections/indices/_create.html
+++ b/src/kibana/plugins/settings/sections/indices/_create.html
@@ -22,6 +22,20 @@ <h1>Configure an index pattern</h1>
               Use event times to create index names
             </label>
           </div>
+
+          <div class="form-group" ng-if="index.isTimeBased && index.nameIsPattern">
+            <label>
+              Index pattern interval&nbsp;
+              <kbn-info info="The interval at which index names rotate."></kbn-info>
+            </label>
+            <select
+              required
+              ng-options="opt.display for opt in index.nameIntervalOptions"
+              ng-model="index.nameInterval"
+              class="form-control">
+            </select>
+          </div>
+
           <div class="form-group">
             <label>
               Index name or pattern
@@ -36,21 +50,14 @@ <h1>Configure an index pattern</h1>
               required
               type="text"
               class="form-control">
-          </div>
-          <section ng-if="index.isTimeBased && index.nameIsPattern">
-            <div class="form-group">
-              <label>
-                Index pattern interval&nbsp;
-                <kbn-info info="The interval at which index names rotate."></kbn-info>
-              </label>
-              <select
-                required
-                ng-options="opt.display for opt in index.nameIntervalOptions"
-                ng-model="index.nameInterval"
-                class="form-control">
-              </select>
+              <small ng-show="index.nameInterval.name == 'weeks'">
+                <strong>Note: </strong>
+                I noticed you're using weekly indices. Kibana requires ISO weeks be used in your index creation.
+                See <a href="https://en.wikipedia.org/wiki/ISO_week_date" target="_blank" title="Wikipedia: ISO Week Date">Wikipedia: ISO Week Date</a>
+              </small>
             </div>
 
+          <section>
             <div class="alert alert-danger" ng-repeat="err in index.patternErrors">
               {{err}}
             </div>
diff --git a/src/kibana/plugins/settings/sections/indices/_create.js b/src/kibana/plugins/settings/sections/indices/_create.js
index a714b93462a8..18e157302fa7 100644
--- a/src/kibana/plugins/settings/sections/indices/_create.js
+++ b/src/kibana/plugins/settings/sections/indices/_create.js
@@ -17,9 +17,7 @@ define(function (require) {
 
     // this and child scopes will write pattern vars here
     var index = $scope.index = {
-      // set in updateDefaultForPatternType()
-      name: null,
-      defaultName: null,
+      name: 'logstash-*',
 
       isTimeBased: true,
       nameIsPattern: false,
@@ -33,7 +31,6 @@ define(function (require) {
     index.timeField = null;
 
     var updateSamples = function () {
-      updateDefaultForPatternType();
       index.samples = null;
       index.existing = null;
       index.patternErrors = [];
@@ -147,22 +144,52 @@ define(function (require) {
       });
     };
 
-    var updateDefaultForPatternType = function () {
-      var newDefault = index.nameIsPattern
-        ? '[logstash-]YYYY.MM.DD'
-        : 'logstash-*';
 
-      if (index.name === index.defaultName) {
-        index.name = index.defaultName = newDefault;
-      } else {
-        index.defaultName = newDefault;
+    $scope.$watchMulti([
+      'index.isTimeBased',
+      'index.nameIsPattern',
+      'index.nameInterval.name'
+    ], function (newVal, oldVal) {
+
+      function getPatternDefault(interval) {
+        switch (interval) {
+        case 'hours':
+          return '[logstash-]YYYY.MM.DD.HH';
+        case 'days':
+          return '[logstash-]YYYY.MM.DD';
+        case 'weeks':
+          return '[logstash-]GGGG.WW';
+        case 'months':
+          return '[logstash-]YYYY.MM';
+        case 'years':
+          return '[logstash-]YYYY';
+        default:
+          return 'logstash-*';
+        }
+      }
+
+      var isTimeBased = newVal[0];
+      var nameIsPattern = newVal[1];
+      var newDefault = getPatternDefault(newVal[2]);
+      var oldDefault = getPatternDefault(oldVal[2]);
+
+      if (index.name === oldDefault) {
+        index.name = newDefault;
       }
 
-      if (!index.nameIsPattern) {
+      if (!isTimeBased) {
+        index.nameIsPattern = false;
+      }
+
+      if (!nameIsPattern) {
         delete index.nameInterval;
         delete index.timeField;
+      } else {
+        index.nameInterval = index.nameInterval || intervals.byName['days'];
+        index.name = index.name || getPatternDefault(index.nameInterval);
       }
-    };
+
+    });
 
     var mockIndexPattern = function (index) {
       // trick the mapper into thinking this is an indexPattern
@@ -182,11 +209,6 @@ define(function (require) {
       'index.nameInterval'
     ], updateSamples);
 
-    $scope.$watchMulti([
-      'index.nameIsPattern',
-      'index.isTimeBased'
-    ], updateDefaultForPatternType);
-
     $scope.$watchMulti([
       'index.name',
       'index.isTimeBased',

From db9199bd50ea74b0bcc062d8db64e3e4132bff75 Mon Sep 17 00:00:00 2001
From: Rashid Khan <rashidkpc@gmail.com>
Date: Thu, 18 Dec 2014 09:21:00 -0700
Subject: [PATCH 15/57] Add init function to aggParams

---
 .../components/agg_types/buckets/geo_hash.js  | 26 ++++++++++++++-----
 src/kibana/components/vis/_agg_config.js      |  4 +++
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/kibana/components/agg_types/buckets/geo_hash.js b/src/kibana/components/agg_types/buckets/geo_hash.js
index d26919d06b3c..6add664123a6 100644
--- a/src/kibana/components/agg_types/buckets/geo_hash.js
+++ b/src/kibana/components/agg_types/buckets/geo_hash.js
@@ -1,8 +1,23 @@
 define(function (require) {
-  return function GeoHashAggDefinition(Private) {
+  return function GeoHashAggDefinition(Private, config) {
     var _ = require('lodash');
     var moment = require('moment');
     var AggType = Private(require('components/agg_types/_agg_type'));
+    var defaultPrecision = 3;
+
+    function getPrecision(precision) {
+      precision = parseInt(precision, 10);
+
+      if (isNaN(precision)) {
+        precision = defaultPrecision;
+      }
+
+      if (precision > config.get('visualization:tileMap:maxPrecision')) {
+        return parseInt(config.get('visualization:tileMap:maxPrecision'), 10);
+      }
+
+      return precision;
+    }
 
     return new AggType({
       name: 'geohash_grid',
@@ -15,14 +30,11 @@ define(function (require) {
         },
         {
           name: 'precision',
-          default: 3,
+          default: defaultPrecision,
           editor: require('text!components/agg_types/controls/precision.html'),
+          init: getPrecision,
           write: function (aggConfig, output) {
-            var precision = parseInt(aggConfig.params.precision, 10);
-            if (isNaN(precision)) {
-              precision = 3;
-            }
-            output.params.precision = precision;
+            output.params.precision = getPrecision(aggConfig.params.precision);
           }
         }
       ]
diff --git a/src/kibana/components/vis/_agg_config.js b/src/kibana/components/vis/_agg_config.js
index d0b492a17aa1..528d95aa4993 100644
--- a/src/kibana/components/vis/_agg_config.js
+++ b/src/kibana/components/vis/_agg_config.js
@@ -75,6 +75,10 @@ define(function (require) {
       self.getAggParams().forEach(function (aggParam) {
         var val = from[aggParam.name];
 
+        if (_.isFunction(aggParam.init)) {
+          val = aggParam.init(val);
+        }
+
         if (val == null) {
           if (aggParam.default == null) return;
           else val = aggParam.default;

From b2fb8230172f1bc5566841b7b011d0b008d7b346 Mon Sep 17 00:00:00 2001
From: Rashid Khan <rashidkpc@gmail.com>
Date: Thu, 18 Dec 2014 10:06:06 -0700
Subject: [PATCH 16/57] Throw error instead of returning empty list

---
 src/kibana/components/index_patterns/_mapper.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/kibana/components/index_patterns/_mapper.js b/src/kibana/components/index_patterns/_mapper.js
index 14d9512a34de..136cd1f04f01 100644
--- a/src/kibana/components/index_patterns/_mapper.js
+++ b/src/kibana/components/index_patterns/_mapper.js
@@ -50,7 +50,7 @@ define(function (require) {
         if (indexPattern.intervalName) {
           promise = self.getIndicesForIndexPattern(indexPattern)
           .then(function (existing) {
-            if (existing.all.length === 0) throw new IndexPatternMissingIndices();
+            if (existing.matches.length === 0) throw new IndexPatternMissingIndices();
             return existing.matches.slice(-5); // Grab the most recent 5
           });
         }

From 299e373882fe61f05a8ce3c939800d84f747d9b8 Mon Sep 17 00:00:00 2001
From: Rashid Khan <rashidkpc@gmail.com>
Date: Thu, 18 Dec 2014 10:31:29 -0700
Subject: [PATCH 17/57] Remove init, replace with existing deserialize

---
 src/kibana/components/agg_types/buckets/geo_hash.js | 2 +-
 src/kibana/components/vis/_agg_config.js            | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/kibana/components/agg_types/buckets/geo_hash.js b/src/kibana/components/agg_types/buckets/geo_hash.js
index 6add664123a6..2b35426b5ca8 100644
--- a/src/kibana/components/agg_types/buckets/geo_hash.js
+++ b/src/kibana/components/agg_types/buckets/geo_hash.js
@@ -32,7 +32,7 @@ define(function (require) {
           name: 'precision',
           default: defaultPrecision,
           editor: require('text!components/agg_types/controls/precision.html'),
-          init: getPrecision,
+          deserialize: getPrecision,
           write: function (aggConfig, output) {
             output.params.precision = getPrecision(aggConfig.params.precision);
           }
diff --git a/src/kibana/components/vis/_agg_config.js b/src/kibana/components/vis/_agg_config.js
index 528d95aa4993..d0b492a17aa1 100644
--- a/src/kibana/components/vis/_agg_config.js
+++ b/src/kibana/components/vis/_agg_config.js
@@ -75,10 +75,6 @@ define(function (require) {
       self.getAggParams().forEach(function (aggParam) {
         var val = from[aggParam.name];
 
-        if (_.isFunction(aggParam.init)) {
-          val = aggParam.init(val);
-        }
-
         if (val == null) {
           if (aggParam.default == null) return;
           else val = aggParam.default;

From 734068e67acc4cb7c418e5dd8a789db276349a9f Mon Sep 17 00:00:00 2001
From: Rashid Khan <rashidkpc@gmail.com>
Date: Thu, 18 Dec 2014 10:33:29 -0700
Subject: [PATCH 18/57] Use _.parseInt

---
 src/kibana/components/agg_types/buckets/geo_hash.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/kibana/components/agg_types/buckets/geo_hash.js b/src/kibana/components/agg_types/buckets/geo_hash.js
index 2b35426b5ca8..ba7de3557da7 100644
--- a/src/kibana/components/agg_types/buckets/geo_hash.js
+++ b/src/kibana/components/agg_types/buckets/geo_hash.js
@@ -6,14 +6,16 @@ define(function (require) {
     var defaultPrecision = 3;
 
     function getPrecision(precision) {
+      var maxPrecision = _.parseInt(config.get('visualization:tileMap:maxPrecision'));
+
       precision = parseInt(precision, 10);
 
       if (isNaN(precision)) {
         precision = defaultPrecision;
       }
 
-      if (precision > config.get('visualization:tileMap:maxPrecision')) {
-        return parseInt(config.get('visualization:tileMap:maxPrecision'), 10);
+      if (precision > maxPrecision) {
+        return maxPrecision;
       }
 
       return precision;

From 4c219fc4afc83140645493632f90e53a06bc48c5 Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Thu, 18 Dec 2014 11:04:22 -0700
Subject: [PATCH 19/57] [config] let the browser compute relative paths

---
 src/kibana/components/config/config.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/kibana/components/config/config.js b/src/kibana/components/config/config.js
index af3d36891f14..0726fcb88e29 100644
--- a/src/kibana/components/config/config.js
+++ b/src/kibana/components/config/config.js
@@ -4,11 +4,11 @@ define(function (require) {
   ]);
 
   var configFile = JSON.parse(require('text!config'));
-  configFile.elasticsearch = (
-    window.location.protocol + '//' +
-    window.location.hostname +
-    (window.location.port ? ':' + window.location.port : '') +
-    '/elasticsearch');
+  configFile.elasticsearch = (function () {
+    var a = document.createElement('a');
+    a.href = 'elasticsearch';
+    return a.href;
+  }());
 
   // allow the rest of the app to get the configFile easily
   module.constant('configFile', configFile);

From 41a56a88223a6a9bf2c98911e1d2a01dde82e320 Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Thu, 18 Dec 2014 11:47:09 -0700
Subject: [PATCH 20/57] [private] unify var names, always return a cached
 instance

---
 src/kibana/services/private.js | 36 ++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/kibana/services/private.js b/src/kibana/services/private.js
index e81a9ea03621..8489b73a810b 100644
--- a/src/kibana/services/private.js
+++ b/src/kibana/services/private.js
@@ -83,10 +83,9 @@ define(function (require) {
       return instance;
     };
 
-    provider.swap = function (fn, constructor) {
+    provider.swap = function (fn, prov) {
       var id = identify(fn);
-      swaps[id] = constructor;
-      delete cache[id];
+      swaps[id] = prov;
     };
 
     provider.$get = ['$injector', function PrivateFactory($injector) {
@@ -101,7 +100,7 @@ define(function (require) {
       function instantiate(prov, locals) {
         if (~privPath.indexOf(prov)) {
           throw new Error(
-            'Circluar refrence to "' + name(prov) + '"' +
+            'Circular refrence to "' + name(prov) + '"' +
             ' found while resolving private deps: ' + pathToString()
           );
         }
@@ -110,21 +109,21 @@ define(function (require) {
 
         var context = {};
         var instance = $injector.invoke(prov, context, locals);
-        // if the function returned an instance of something, use that. Otherwise use the context
         if (!_.isObject(instance)) instance = context;
 
         privPath.pop();
         return instance;
       }
 
-      function Private(prov) {
-        var id = identify(prov);
+      // retrieve an instance from cache or create and store on
+      function get(id, prov, $delegateProv, $delegateId) {
         if (cache[id]) return cache[id];
 
         var instance;
-        if (swaps[id]) {
-          instance = instantiate(swaps[id], {
-            $decorate: _.partial(instantiate, prov)
+
+        if ($delegateId != null && $delegateProv != null) {
+          instance = instantiate(prov, {
+            $decorate: _.partial(get, $delegateId, $delegateProv)
           });
         } else {
           instance = instantiate(prov);
@@ -133,6 +132,23 @@ define(function (require) {
         return (cache[id] = instance);
       }
 
+      // main api, get the appropriate instance for a provider
+      function Private(prov) {
+        var id = identify(prov);
+        var $delegateId;
+        var $delegateProv;
+
+        if (swaps[id]) {
+          $delegateId = id;
+          $delegateProv = prov;
+
+          prov = swaps[$delegateId];
+          id = identify(prov);
+        }
+
+        return get(id, prov, $delegateId, $delegateProv);
+      }
+
       Private.stub = provider.stub;
       Private.swap = provider.swap;
 

From 824422871682961dda885da21df08ff58560f2b9 Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Thu, 18 Dec 2014 11:48:51 -0700
Subject: [PATCH 21/57] [private] added tests for private

---
 test/unit/specs/services/private.js | 106 ++++++++++++++++++++++++++++
 1 file changed, 106 insertions(+)
 create mode 100644 test/unit/specs/services/private.js

diff --git a/test/unit/specs/services/private.js b/test/unit/specs/services/private.js
new file mode 100644
index 000000000000..6393e0f46d6c
--- /dev/null
+++ b/test/unit/specs/services/private.js
@@ -0,0 +1,106 @@
+define(function (require) {
+  describe.only('Private module loader', function () {
+
+    var Private;
+
+    beforeEach(module('kibana'));
+    beforeEach(inject(function ($injector) {
+      Private = $injector.get('Private');
+    }));
+
+    it('accepts a provider that will be called to init a module', function () {
+      var football = {};
+      function Provider() {
+        return football;
+      }
+
+      var instance = Private(Provider);
+      expect(instance).to.be(football);
+    });
+
+    it('injects angular dependencies into the Provider', function () {
+      function Provider(Private) {
+        return Private;
+      }
+
+      var instance = Private(Provider);
+      expect(instance).to.be(Private);
+    });
+
+    it('detects circular dependencies', function () {
+      expect(function () {
+        function Provider1() {
+          var p3 = Private(Provider3);
+        }
+
+        function Provider2() {
+          var p3 = Private(Provider3);
+        }
+
+        function Provider3() {
+          var p1 = Private(Provider3);
+        }
+
+        var p1 = Private(Provider1);
+      }).to.throwException(/circular/i);
+    });
+
+    it('allways provides the same instance form the Provider', function () {
+      function Provider() {
+        return {};
+      }
+
+      expect(Private(Provider)).to.be(Private(Provider));
+    });
+
+    describe('#stub', function () {
+      it('accepts a replacement instance for a Provider', function () {
+        var replaced = {};
+        var replacement = {};
+
+        function Provider() {
+          return replaced;
+        }
+
+        var instance = Private(Provider);
+        expect(instance).to.be(replaced);
+
+        Private.stub(Provider, replacement);
+
+        var instance2 = Private(Provider);
+        expect(instance2).to.be(replacement);
+
+        Private.stub(Provider, replaced);
+
+        var instance3 = Private(Provider);
+        expect(instance3).to.be(replaced);
+      });
+    });
+
+    describe('#swap', function () {
+      it('accepts a new Provider that should replace an existing Provider', function () {
+        function Provider1() {
+          return {};
+        }
+
+        function Provider2() {
+          return {};
+        }
+
+        var instance1 = Private(Provider1);
+        expect(instance1).to.be.an('object');
+
+        Private.swap(Provider1, Provider2);
+
+        var instance2 = Private(Provider1);
+        expect(instance2).to.be.an('object');
+        expect(instance2).to.not.be(instance1);
+
+        Private.swap(Provider1, Provider1);
+
+        var instance3 = Private(Provider1);
+        expect(instance3).to.be(instance1);
+      });
+    });
+  });
+});
\ No newline at end of file

From 05cae2e7d09ef442c4f94bd06a2bf67ef8c54371 Mon Sep 17 00:00:00 2001
From: Joe Fleming <joe.fleming@gmail.com>
Date: Thu, 18 Dec 2014 11:47:01 -0700
Subject: [PATCH 22/57] clean up tests, add failing test

---
 .../specs/directives/validate_index_name.js   | 165 +++++-------------
 1 file changed, 48 insertions(+), 117 deletions(-)

diff --git a/test/unit/specs/directives/validate_index_name.js b/test/unit/specs/directives/validate_index_name.js
index c73b89f484cc..3afc73dac6bf 100644
--- a/test/unit/specs/directives/validate_index_name.js
+++ b/test/unit/specs/directives/validate_index_name.js
@@ -15,123 +15,54 @@ define(function (require) {
       $rootScope = _$rootScope_;
     }));
 
-    it('should not accept null index name patterns', function () {
-      $rootScope.indexName = null;
-      var element = $compile(html)($rootScope);
-      $rootScope.$digest();
-      expect(element.hasClass('ng-invalid')).to.be.ok();
-    });
-
-    it('should not accept undefined index name patterns', function () {
-      $rootScope.indexName = undefined;
-      var element = $compile(html)($rootScope);
-      $rootScope.$digest();
-      expect(element.hasClass('ng-invalid')).to.be.ok();
-    });
-
-    it('should not accept empty index name patterns', function () {
-      $rootScope.indexName = '';
-      var element = $compile(html)($rootScope);
-      $rootScope.$digest();
-      expect(element.hasClass('ng-invalid')).to.be.ok();
-    });
-
-    it('should not accept . as an index name pattern', function () {
-      $rootScope.indexName = '.';
-      var element = $compile(html)($rootScope);
-      $rootScope.$digest();
-      expect(element.hasClass('ng-invalid')).to.be.ok();
-    });
-
-    it('should not accept .. as an index name pattern', function () {
-      $rootScope.indexName = '..';
-      var element = $compile(html)($rootScope);
-      $rootScope.$digest();
-      expect(element.hasClass('ng-invalid')).to.be.ok();
-    });
-
-    it('should not accept \\ in an index name pattern', function () {
-      $rootScope.indexName = 'foo\\bar';
-      var element = $compile(html)($rootScope);
-      $rootScope.$digest();
-      expect(element.hasClass('ng-invalid')).to.be.ok();
-    });
-
-    it('should not accept / in an index name pattern', function () {
-      $rootScope.indexName = 'foo/bar';
-      var element = $compile(html)($rootScope);
-      $rootScope.$digest();
-      expect(element.hasClass('ng-invalid')).to.be.ok();
-    });
-
-    it('should not accept ? in an index name pattern', function () {
-      $rootScope.indexName = 'foo?bar';
-      var element = $compile(html)($rootScope);
-      $rootScope.$digest();
-      expect(element.hasClass('ng-invalid')).to.be.ok();
-    });
-
-    it('should not accept " in an index name pattern', function () {
-      $rootScope.indexName = 'foo"bar';
-      var element = $compile(html)($rootScope);
-      $rootScope.$digest();
-      expect(element.hasClass('ng-invalid')).to.be.ok();
-    });
-
-    it('should not accept < in an index name pattern', function () {
-      $rootScope.indexName = 'foo<bar';
-      var element = $compile(html)($rootScope);
-      $rootScope.$digest();
-      expect(element.hasClass('ng-invalid')).to.be.ok();
-    });
-
-    it('should not accept > in an index name pattern', function () {
-      $rootScope.indexName = 'foo>bar';
-      var element = $compile(html)($rootScope);
-      $rootScope.$digest();
-      expect(element.hasClass('ng-invalid')).to.be.ok();
-    });
-
-    it('should not accept | in an index name pattern', function () {
-      $rootScope.indexName = 'foo|bar';
-      var element = $compile(html)($rootScope);
-      $rootScope.$digest();
-      expect(element.hasClass('ng-invalid')).to.be.ok();
-    });
-
-    it('should not accept spaces in an index name pattern', function () {
-      $rootScope.indexName = 'foo bar';
-      var element = $compile(html)($rootScope);
-      $rootScope.$digest();
-      expect(element.hasClass('ng-invalid')).to.be.ok();
-    });
-
-    it('should not accept , in an index name pattern', function () {
-      $rootScope.indexName = 'foo,bar';
-      var element = $compile(html)($rootScope);
-      $rootScope.$digest();
-      expect(element.hasClass('ng-invalid')).to.be.ok();
-    });
-
-    it('should accept a valid index name pattern', function () {
-      $rootScope.indexName = 'foo.bar';
-      var element = $compile(html)($rootScope);
-      $rootScope.$digest();
-      expect(element.hasClass('ng-invalid')).to.not.be.ok();
-    });
-
-    it('should accept * in an index name pattern', function () {
-      $rootScope.indexName = 'foo.*';
-      var element = $compile(html)($rootScope);
-      $rootScope.$digest();
-      expect(element.hasClass('ng-invalid')).to.not.be.ok();
-    });
-
-    it('should accept [] in an index name pattern', function () {
-      $rootScope.indexName = '[foo]-YYYY.MM.DD';
-      var element = $compile(html)($rootScope);
-      $rootScope.$digest();
-      expect(element.hasClass('ng-invalid')).to.not.be.ok();
+    function checkPattern(input) {
+      $rootScope.indexName = input;
+      var element = $compile(html)($rootScope);
+      $rootScope.$digest();
+      return element;
+    }
+
+    var badPatterns = [
+      null,
+      undefined,
+      '',
+      '.',
+      '..',
+      '...',
+      'foo\\bar',
+      'foo/bar',
+      'foo?bar',
+      'foo"bar',
+      'foo<bar',
+      'foo>bar',
+      'foo|bar',
+      'foo bar',
+      'foo,bar',
+    ];
+
+    var goodPatterns = [
+      'foo',
+      'foo.bar',
+      'foo*',
+      'foo.bar*',
+      'foo.*',
+      '[foo-]YYYY-MM-DD',
+    ];
+
+    badPatterns.forEach(function (pattern) {
+      it('should not accept index pattern: ' + pattern, function () {
+        var element = checkPattern(pattern);
+        expect(element.hasClass('ng-invalid')).to.be(true);
+        expect(element.hasClass('ng-valid')).to.not.be(true);
+      });
+    });
+
+    goodPatterns.forEach(function (pattern) {
+      it('should accept index pattern: ' + pattern, function () {
+        var element = checkPattern(pattern);
+        expect(element.hasClass('ng-invalid')).to.not.be(true);
+        expect(element.hasClass('ng-valid')).to.be(true);
+      });
     });
   });
 });
\ No newline at end of file

From 0d5603ba82c7f73539df576eacf991829c3f5388 Mon Sep 17 00:00:00 2001
From: Joe Fleming <joe.fleming@gmail.com>
Date: Thu, 18 Dec 2014 11:51:11 -0700
Subject: [PATCH 23/57] apparently ... is a passing index pattern

---
 test/unit/specs/directives/validate_index_name.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/specs/directives/validate_index_name.js b/test/unit/specs/directives/validate_index_name.js
index 3afc73dac6bf..da1b5eede0e7 100644
--- a/test/unit/specs/directives/validate_index_name.js
+++ b/test/unit/specs/directives/validate_index_name.js
@@ -28,7 +28,6 @@ define(function (require) {
       '',
       '.',
       '..',
-      '...',
       'foo\\bar',
       'foo/bar',
       'foo?bar',
@@ -41,6 +40,7 @@ define(function (require) {
     ];
 
     var goodPatterns = [
+      '...',
       'foo',
       'foo.bar',
       'foo*',

From 539cb1538b9a81cef442fb5fa2837a592d28fd9b Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Thu, 18 Dec 2014 11:54:07 -0700
Subject: [PATCH 24/57] [private] copied pr desc into the code

---
 src/kibana/services/private.js | 47 +++++++++++++++++++++++++++++-----
 1 file changed, 40 insertions(+), 7 deletions(-)

diff --git a/src/kibana/services/private.js b/src/kibana/services/private.js
index 8489b73a810b..ac1d129ee4b3 100644
--- a/src/kibana/services/private.js
+++ b/src/kibana/services/private.js
@@ -1,32 +1,28 @@
 define(function (require) {
   /**
+   * # `Private()`
    * Private module loader, used to merge angular and require js dependency styles
    * by allowing a require.js module to export a single provider function that will
    * create a value used within an angular application. This provider can declare
    * angular dependencies by listing them as arguments, and can be require additional
    * Private modules.
    *
-   * ## Examples
-   *
-   * Define a private module provider:
+   * ## Define a private module provider:
    * ```js
    * define(function (require) {
    *   return function PingProvider($http) {
-   *
    *     this.ping = function () {
    *       return $http.head('/health-check');
    *     };
-   *
    *   };
    * });
    * ```
    *
-   * Require a private module:
+   * ## Require a private module:
    * ```js
    * define(function (require) {
    *   return function ServerHealthProvider(Private, Promise) {
    *     var ping = Private(require('components/ping'));
-   *
    *     return {
    *       check: Promise.method(function () {
    *         var attempts = 0;
@@ -49,6 +45,43 @@ define(function (require) {
    * });
    * ```
    *
+   * # `Private.stub(provider, newInstance)`
+   * `Private.stub()` replaces the instance of a module with another value. This is all we have needed until now.
+   *
+   * ```js
+   * beforeEach(inject(function ($injector, Private) {
+   *   Private.stub(
+   *     // since this module just exports a function, we need to change
+   *     // what Private returns in order to modify it's behavior
+   *     require('components/agg_response/hierarchical/_build_split'),
+   *     sinon.stub().returns(fakeSplit)
+   *   );
+   * }));
+   * ```
+   *
+   * # `Private.swap(oldProvider, newProvider)`
+   * This new method does an 1-for-1 swap of module providers, unlike `stub()` which replaces a modules instance.
+   * Pass the module you want to swap out, and the one it should be replaced with, then profit.
+   *
+   * Note: even though this example shows `swap()` being called in a config
+   * function, it can be called from anywhere. It is particularly useful
+   * in this scenario though.
+   *
+   * ```js
+   * beforeEach(module('kibana', function (PrivateProvider) {
+   *   PrivateProvider.swap(
+   *     // since the courier is required automatically before the tests are loaded,
+   *     // we can't stub it's internal components unless we do so before the
+   *     // application starts. This is why angular has config functions
+   *     require('components/courier/_redirect_when_missing'),
+   *     function StubbedRedirectProvider($decorate) {
+   *       // $decorate is a function that will instantiate the original module when called
+   *       return sinon.spy($decorate());
+   *     }
+   *   );
+   * }));
+   * ```
+   *
    * @param {[type]} prov [description]
    */
 

From f9185e0e16f42cb43ce937f3cf482afcdd500cef Mon Sep 17 00:00:00 2001
From: lukasolson <olson.lukas@gmail.com>
Date: Thu, 18 Dec 2014 12:11:37 -0700
Subject: [PATCH 25/57] Store sort options in saved searches (#2097)

---
 src/kibana/plugins/discover/controllers/discover.js         | 2 ++
 src/kibana/plugins/discover/saved_searches/_saved_search.js | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/kibana/plugins/discover/controllers/discover.js b/src/kibana/plugins/discover/controllers/discover.js
index c55c182ccfb0..d47b339e945b 100644
--- a/src/kibana/plugins/discover/controllers/discover.js
+++ b/src/kibana/plugins/discover/controllers/discover.js
@@ -88,6 +88,7 @@ define(function (require) {
 
     var stateDefaults = {
       query: initialQuery || '',
+      sort: savedSearch.sort || [],
       columns: savedSearch.columns || ['_source'],
       index: $scope.searchSource.get('index').id || config.get('defaultIndex'),
       interval: 'auto',
@@ -245,6 +246,7 @@ define(function (require) {
       .then(function () {
         savedSearch.id = savedSearch.title;
         savedSearch.columns = $scope.state.columns;
+        savedSearch.sort = $scope.state.sort;
 
         return savedSearch.save()
         .then(function () {
diff --git a/src/kibana/plugins/discover/saved_searches/_saved_search.js b/src/kibana/plugins/discover/saved_searches/_saved_search.js
index c732489abc46..8eaa38c9da75 100644
--- a/src/kibana/plugins/discover/saved_searches/_saved_search.js
+++ b/src/kibana/plugins/discover/saved_searches/_saved_search.js
@@ -21,14 +21,16 @@ define(function (require) {
           title: 'string',
           description: 'string',
           hits: 'integer',
-          columns: 'string'
+          columns: 'string',
+          sort: 'array'
         },
 
         defaults: {
           title: 'New Saved Search',
           description: '',
           columns: [],
-          hits: 0
+          hits: 0,
+          sort: []
         },
 
         searchSource: true

From 6c44da1c7cf7c667bb2fb64e23a49b64d90a7c81 Mon Sep 17 00:00:00 2001
From: Rashid Khan <rashidkpc@gmail.com>
Date: Thu, 18 Dec 2014 12:25:45 -0700
Subject: [PATCH 26/57] If details row is open, rebind the row to the detail
 scope

---
 src/kibana/plugins/discover/directives/table_row.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/kibana/plugins/discover/directives/table_row.js b/src/kibana/plugins/discover/directives/table_row.js
index 70466995d9b0..4d8f5e39ba68 100644
--- a/src/kibana/plugins/discover/directives/table_row.js
+++ b/src/kibana/plugins/discover/directives/table_row.js
@@ -53,13 +53,10 @@ define(function (require) {
 
         // toggle display of the rows details, a full list of the fields from each row
         $scope.toggleRow = function () {
-          var row = $scope.row;
+          var $detailsTr = $el.next();
 
           $scope.open = !$scope.open;
 
-          var $tr = $el;
-          var $detailsTr = $tr.next();
-
           ///
           // add/remove $details children
           ///
@@ -78,7 +75,7 @@ define(function (require) {
           // empty the details and rebuild it
           $detailsTr.html(detailsHtml);
 
-          $detailsScope.row = row;
+          $detailsScope.row = $scope.row;
 
           $compile($detailsTr)($detailsScope);
         };
@@ -151,6 +148,10 @@ define(function (require) {
             }
           });
 
+          if ($scope.open) {
+            $detailsScope.row = row;
+          }
+
           // trim off cells that were not used rest of the cells
           $cells.filter(':gt(' + (newHtmls.length - 1) + ')').remove();
         }

From eafb533d13bd6f4c56d848bb74a0bb0bca0ecabb Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Thu, 18 Dec 2014 12:45:46 -0700
Subject: [PATCH 27/57] reenable all tests

---
 test/unit/specs/services/private.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/specs/services/private.js b/test/unit/specs/services/private.js
index 6393e0f46d6c..a27ba223c6ab 100644
--- a/test/unit/specs/services/private.js
+++ b/test/unit/specs/services/private.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  describe.only('Private module loader', function () {
+  describe('Private module loader', function () {
 
     var Private;
 

From e8b23c813c669c67fd7a59306064f10dbfc893a1 Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Thu, 18 Dec 2014 12:47:29 -0700
Subject: [PATCH 28/57] [notifier] stop the courier on fatal errors

---
 src/kibana/components/notify/_notifier.js | 16 ++++++++++------
 src/kibana/components/notify/notify.js    | 11 +++++++++--
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/kibana/components/notify/_notifier.js b/src/kibana/components/notify/_notifier.js
index 89f081b19614..58a4af812ad0 100644
--- a/src/kibana/components/notify/_notifier.js
+++ b/src/kibana/components/notify/_notifier.js
@@ -102,6 +102,15 @@ define(function (require) {
     });
   }
 
+  // to be notified when the first fatal error occurs, push a function into this array.
+  Notifier.fatalCallbacks = [];
+
+  // set the timer functions that all notification managers will use
+  Notifier.setTimerFns = function (set, clear) {
+    setTO = set;
+    clearTO = clear;
+  };
+
   // simply a pointer to the global notif list
   Notifier.prototype._notifs = notifs;
 
@@ -163,6 +172,7 @@ define(function (require) {
    */
   Notifier.prototype._showFatal = function (err) {
     if (firstFatal) {
+      _.callEach(Notifier.fatalCallbacks);
       firstFatal = false;
       window.addEventListener('hashchange', function () {
         window.location.reload();
@@ -247,12 +257,6 @@ define(function (require) {
     };
   }
 
-  // set the timer functions that all notification managers will use
-  Notifier.prototype._setTimerFns = function (set, clear) {
-    setTO = set;
-    clearTO = clear;
-  };
-
   // general functionality used by .event() and .lifecycle()
   function createGroupLogger(type, opts) {
     // Track the groups managed by this logger
diff --git a/src/kibana/components/notify/notify.js b/src/kibana/components/notify/notify.js
index b9e9b02f44b2..24c609e07b45 100644
--- a/src/kibana/components/notify/notify.js
+++ b/src/kibana/components/notify/notify.js
@@ -20,9 +20,16 @@ define(function (require) {
     return Notifier;
   });
 
-  module.run(function ($timeout) {
+  module.run(function ($timeout, Promise, courier) {
     // provide alternate methods for setting timeouts, which will properly trigger digest cycles
-    rootNotifier._setTimerFns($timeout, $timeout.cancel);
+    Notifier.setTimerFns($timeout, $timeout.cancel);
+
+    var onFatalDefer = Promise.defer();
+    onFatalDefer.promise.then(function () {
+      courier.close();
+    });
+
+    Notifier.fatalCallbacks.push(onFatalDefer.resolve);
   });
 
   /**

From e3b50fbec6c6c35ce3070bde203aedeedcb82ebf Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Thu, 18 Dec 2014 12:47:56 -0700
Subject: [PATCH 29/57] [timepicker] fix invalid html entity

---
 src/kibana/components/timepicker/timepicker.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/kibana/components/timepicker/timepicker.html b/src/kibana/components/timepicker/timepicker.html
index 336f9020036b..4698718ddb37 100644
--- a/src/kibana/components/timepicker/timepicker.html
+++ b/src/kibana/components/timepicker/timepicker.html
@@ -135,7 +135,7 @@
                   </div>
 
                   <div class="kbn-timepicker-section kbn-timepicker-alert">
-                    <label>&nbsp</label>
+                    <label>&nbsp;</label>
                     <div class="form-group">
                       <button
                         class="btn btn-primary kbn-timepicker-go"

From 03f0e5157b5ea7ff009c98e80f0d56fa20156555 Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Thu, 18 Dec 2014 12:57:34 -0700
Subject: [PATCH 30/57] [timepicker] HTMLPrettify'd that thang

---
 .../components/timepicker/timepicker.html     | 254 +++++++++---------
 1 file changed, 132 insertions(+), 122 deletions(-)

diff --git a/src/kibana/components/timepicker/timepicker.html b/src/kibana/components/timepicker/timepicker.html
index 4698718ddb37..14408c5c1a84 100644
--- a/src/kibana/components/timepicker/timepicker.html
+++ b/src/kibana/components/timepicker/timepicker.html
@@ -3,162 +3,172 @@
     .kbn-timepicker [kbn-time-input] {
       text-align: center;
     }
-
     .kbn-timepicker-modes {
       text-transform: capitalize;
     }
-
     .kbn-timepicker-section {
       float: left;
       padding: 0px 15px;
     }
-
     .kbn-refresh-list {
       padding: 0px 15px;
     }
-
     .kbn-timepicket-alert {
       width: 100px;
     }
   </style>
 
- <ul class="nav nav-tabs" role="tablist" ng-init="tab = 'filter'">
-      <li ng-class="{active:tab== 'filter'}" ><a href ng-click="tab = 'filter'">Time Filter</a></li>
-      <li ng-class="{active:tab== 'interval'}"><a href ng-click="tab = 'interval'">Refresh Interval</a></li>
-    </ul>
-
-    <div class="tab-content">
-      <!-- Filters -->
-      <div ng-show="tab == 'filter'" role="tabpanel" class="tab-pane active">
-        </br>
-        <div class="row">
-          <div class="col-md-2">
-            <ul class="nav nav-pills nav-stacked kbn-timepicker-modes">
-              <li ng-class="{active: mode=='quick'}"><a ng-click="setMode('quick')" >quick</a></li>
-              <li ng-class="{active: mode=='relative'}"><a ng-click="setMode('relative')" >relative</a></li>
-              <li ng-class="{active: mode=='absolute'}"><a ng-click="setMode('absolute')" >absolute</a></li>
-            </ul>
-          </div>
+  <ul class="nav nav-tabs" role="tablist" ng-init="tab = 'filter'">
+    <li ng-class="{active:tab== 'filter'}">
+      <a href ng-click="tab = 'filter'">Time Filter</a>
+    </li>
+    <li ng-class="{active:tab== 'interval'}">
+      <a href ng-click="tab = 'interval'">Refresh Interval</a>
+    </li>
+  </ul>
+
+  <div class="tab-content">
+
+    <!-- Filters -->
+    <div ng-show="tab == 'filter'" role="tabpanel" class="tab-pane active">
+      <br>
+      <div class="row">
+        <div class="col-md-2">
+          <ul class="nav nav-pills nav-stacked kbn-timepicker-modes">
+            <li ng-class="{active: mode=='quick'}">
+              <a ng-click="setMode('quick')">quick</a>
+            </li>
+            <li ng-class="{active: mode=='relative'}">
+              <a ng-click="setMode('relative')">relative</a>
+            </li>
+            <li ng-class="{active: mode=='absolute'}">
+              <a ng-click="setMode('absolute')">absolute</a>
+            </li>
+          </ul>
+        </div>
 
-          <div class="col-md-10">
-            <div ng-switch on="mode" class="container-fluid">
-              <div ng-switch-when="quick" bindonce>
+        <div class="col-md-10">
+          <div ng-switch on="mode" class="container-fluid">
+            <div ng-switch-when="quick" bindonce>
 
-                <div ng-repeat="list in quickLists" class="kbn-timepicker-section">
-                  <ul class="list-unstyled">
-                    <li ng-repeat="option in list"><a ng-click="setQuick(option.from, option.to)" bo-text="option.display"></a></li>
-                  </ul>
-                </div>
-
-                <!-- TODO: Add a section for custom intervals -->
+              <div ng-repeat="list in quickLists" class="kbn-timepicker-section">
+                <ul class="list-unstyled">
+                  <li ng-repeat="option in list">
+                    <a ng-click="setQuick(option.from, option.to)" bo-text="option.display"></a>
+                  </li>
+                </ul>
               </div>
-              <div ng-switch-when="relative">
-
-                <form
-                  ng-submit="applyRelative()"
-                  class="form-inline"
-                  name="relativeTime">
 
-                  <div class="kbn-timepicker-section">
-                    <label>
-                      From:
-                      <span ng-show="relative.preview">{{relative.preview}}</span><span ng-hide="relative.preview"><i>Invalid Expression</i></span>
-                    </label><br>
-                    <div class="form-group">
-                      <input type="number" class="form-control" required
-                        ng-model="relative.count"
-                        ng-change="formatRelative()">
-                    </div>
-                    <div class="form-group">
-                      <select class="form-control col-xs-2"
-                        ng-model="relative.unit"
-                        ng-options="opt.value as opt.text for opt in relativeOptions"
-                        ng-change="formatRelative()">
-                      </select>
-                    </div>
-                    <br>
-                    <div class="small">
-                      <input type="checkbox"
-                        ng-model="relative.round"
-                        ng-checked="relative.round"
-                        ng-change="formatRelative()"/> round to the {{units[relative.unit]}}
-                    </div>
+              <!-- TODO: Add a section for custom intervals -->
+            </div>
 
+            <div ng-switch-when="relative">
+              <form ng-submit="applyRelative()" class="form-inline" name="relativeTime">
+                <div class="kbn-timepicker-section">
+                  <label>
+                    From:
+                    <span ng-show="relative.preview">{{relative.preview}}</span>
+                    <span ng-hide="relative.preview"><i>Invalid Expression</i></span>
+                  </label>
+                  <br>
+                  <div class="form-group">
+                    <input
+                      required
+                      ng-model="relative.count"
+                      ng-change="formatRelative()"
+                      type="number"
+                      class="form-control">
                   </div>
-
-                  <div class="kbn-timepicker-section">
-                    <label>
-                      To: Now
-                    </label><br>
-                    <div class="form-group">
-                      <input type="text" disabled class="form-control" value="Now">
-                    </div>
+                  <div class="form-group">
+                    <select
+                      ng-model="relative.unit"
+                      ng-options="opt.value as opt.text for opt in relativeOptions"
+                      ng-change="formatRelative()"
+                      class="form-control col-xs-2">
+                    </select>
                   </div>
-
-                  <div class="kbn-timepicker-section">
-                    <label>&nbsp;</label><br>
-                    <div class="form-group">
-                      <button
-                        type="submit"
-                        class="btn btn-primary kbn-timepicker-go"
-                        ng-disabled="!relative.preview">
-                        Go
-                      </button>
-                    </div>
+                  <br>
+                  <div class="small">
+                    <input
+                      ng-model="relative.round"
+                      ng-checked="relative.round"
+                      ng-change="formatRelative()"
+                      type="checkbox">
+                    round to the {{units[relative.unit]}}
                   </div>
-                </form>
-
-              </div>
+                </div>
 
-              <div ng-switch-when="absolute">
+                <div class="kbn-timepicker-section">
+                  <label>
+                    To: Now
+                  </label>
+                  <br>
+                  <div class="form-group">
+                    <input type="text" disabled class="form-control" value="Now">
+                  </div>
+                </div>
 
-                <form name="absoluteTime" ng-submit="applyAbsolute()">
+                <div class="kbn-timepicker-section">
+                  <label>&nbsp;</label>
+                  <br>
+                  <div class="form-group">
+                    <button type="submit" class="btn btn-primary kbn-timepicker-go" ng-disabled="!relative.preview">
+                      Go
+                    </button>
+                  </div>
+                </div>
+              </form>
+            </div>
 
-                  <div class="kbn-timepicker-section">
-                    <div>
-                      <label class="small">From: <span ng-show="!absolute.from"><i>Invalid Date</i></span></label>
-                      <input type="text" required class="form-control" input-datetime="{{format}}" ng-model="absolute.from">
-                    </div>
-                    <div>
-                      <datepicker ng-model="absolute.from" max="absolute.to" show-weeks="false"></datepicker>
-                    </div>
+            <div ng-switch-when="absolute">
+              <form name="absoluteTime" ng-submit="applyAbsolute()">
+                <div class="kbn-timepicker-section">
+                  <div>
+                    <label class="small">From: <span ng-show="!absolute.from"><i>Invalid Date</i></span>
+                    </label>
+                    <input type="text" required class="form-control" input-datetime="{{format}}" ng-model="absolute.from">
                   </div>
+                  <div>
+                    <datepicker ng-model="absolute.from" max="absolute.to" show-weeks="false"></datepicker>
+                  </div>
+                </div>
 
-                  <div class="kbn-timepicker-section">
-                    <div>
-                      <label class="small">To: <span ng-show="!absolute.to"><i>Invalid Date</i></span></label>
-                      <input type="text" required class="form-control" input-datetime="{{format}}" ng-model="absolute.to">
-                    </div>
-                    <div>
-                      <datepicker ng-model="absolute.to" min="absolute.from" show-weeks="false"></datepicker>
-                    </div>
+                <div class="kbn-timepicker-section">
+                  <div>
+                    <label class="small">To: <span ng-show="!absolute.to"><i>Invalid Date</i></span>
+                    </label>
+                    <input type="text" required class="form-control" input-datetime="{{format}}" ng-model="absolute.to">
                   </div>
+                  <div>
+                    <datepicker ng-model="absolute.to" min="absolute.from" show-weeks="false"></datepicker>
+                  </div>
+                </div>
 
-                  <div class="kbn-timepicker-section kbn-timepicker-alert">
-                    <label>&nbsp;</label>
-                    <div class="form-group">
-                      <button
-                        class="btn btn-primary kbn-timepicker-go"
-                        ng-disabled="absolute.from > absolute.to || !absolute.from || !absolute.to"
-                        type="submit">
-                        Go
-                      </button>
-                      <span class="small" ng-show="absolute.from > absolute.to"><strong>From</strong> must occur before <strong>To</strong></span>
-                    </div>
+                <div class="kbn-timepicker-section kbn-timepicker-alert">
+                  <label>&nbsp;</label>
+                  <div class="form-group">
+                    <button class="btn btn-primary kbn-timepicker-go" ng-disabled="absolute.from > absolute.to || !absolute.from || !absolute.to" type="submit">
+                      Go
+                    </button>
+                    <span class="small" ng-show="absolute.from > absolute.to"><strong>From</strong> must occur before <strong>To</strong></span>
                   </div>
-                </form>
-              </div>
+                </div>
+              </form>
             </div>
           </div>
         </div>
       </div>
-      <!-- Refresh Intervals -->
-      <div ng-show="tab == 'interval'" role="tabpanel" class="tab-pane active">
-        </br>
-         <ul class="list-unstyled kbn-refresh-list">
-          <li ng-repeat="interval in refreshIntervals"><a ng-click="setRefreshInterval(interval)">{{interval.display}}</a></li>
-          </ul>
-        </div>
-      </div>
     </div>
+
+    <!-- Refresh Intervals -->
+    <div ng-show="tab == 'interval'" role="tabpanel" class="tab-pane active">
+      <br>
+      <ul class="list-unstyled kbn-refresh-list">
+        <li ng-repeat="interval in refreshIntervals">
+          <a ng-click="setRefreshInterval(interval)">{{interval.display}}</a>
+        </li>
+      </ul>
+    </div>
+
+  </div>
 </div>

From 32be3c3f9d0b173ba515fda5198a764e955aa35e Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Thu, 18 Dec 2014 13:08:33 -0700
Subject: [PATCH 31/57] [courier] warn when refresh interval is too damn high

---
 src/kibana/components/courier/looper/search.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/kibana/components/courier/looper/search.js b/src/kibana/components/courier/looper/search.js
index 88c14cda4780..96683a1e307c 100644
--- a/src/kibana/components/courier/looper/search.js
+++ b/src/kibana/components/courier/looper/search.js
@@ -15,7 +15,10 @@ define(function (require) {
      */
     var searchLooper = new Looper(null, function () {
       // fatal if refreshes take longer then the refresh interval
-      if (_activeAutoSearch) return notif.fatal(new errors.HastyRefresh());
+      if (_activeAutoSearch) {
+        notif.warning('Skipping search attempt because previous search request has not completed');
+        return;
+      }
 
       return _activeAutoSearch = Promise.all([fetch.searches(), fetch.segmentedSearches()])
       .finally(function (res) {

From be7e9f2e1c438f2b1f4d143e1b7f2be81ebd735e Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Thu, 18 Dec 2014 13:10:17 -0700
Subject: [PATCH 32/57] [courier] restart the looper on #fetch(), don't
 trigger. Fetch directly instead.

---
 src/kibana/components/courier/courier.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/kibana/components/courier/courier.js b/src/kibana/components/courier/courier.js
index 5a91918b1792..9aadf4153400 100644
--- a/src/kibana/components/courier/courier.js
+++ b/src/kibana/components/courier/courier.js
@@ -16,6 +16,7 @@ define(function (require) {
 
       var pendingRequests = Private(require('components/courier/_pending_requests'));
 
+      var fetch = Private(require('components/courier/fetch/fetch'));
       var docLooper = self.docLooper = Private(require('components/courier/looper/doc'));
       var searchLooper = self.searchLooper = Private(require('components/courier/looper/search'));
 
@@ -57,7 +58,11 @@ define(function (require) {
        * individual errors are routed to their respective requests.
        */
       self.fetch = function () {
-        return searchLooper.run();
+        searchLooper.start();
+        return Promise.all([
+          fetch.searches(),
+          fetch.segmentedSearches()
+        ]);
       };
 
 

From 7cd1ba23d7cf588776906e4038462c3ea49580ae Mon Sep 17 00:00:00 2001
From: Chris Cowan <chris@chriscowan.us>
Date: Thu, 18 Dec 2014 12:40:34 -0800
Subject: [PATCH 33/57] Closes #2346 - Don't refresh request when removing
 disabled filters

---
 .../components/filter_bar/lib/onlyDisabled.js | 12 ++++++++
 src/kibana/plugins/dashboard/index.js         |  4 ++-
 .../plugins/discover/controllers/discover.js  |  4 ++-
 .../components/filter_bar/onlyDisabled.js     | 28 +++++++++++++++++++
 4 files changed, 46 insertions(+), 2 deletions(-)
 create mode 100644 src/kibana/components/filter_bar/lib/onlyDisabled.js
 create mode 100644 test/unit/specs/components/filter_bar/onlyDisabled.js

diff --git a/src/kibana/components/filter_bar/lib/onlyDisabled.js b/src/kibana/components/filter_bar/lib/onlyDisabled.js
new file mode 100644
index 000000000000..f2e42fc567a7
--- /dev/null
+++ b/src/kibana/components/filter_bar/lib/onlyDisabled.js
@@ -0,0 +1,12 @@
+define(function (require) {
+  var _ = require('lodash');
+
+  var pluckDisabled = function (filter) {
+    return filter.meta.disabled;
+  };
+
+  return function (newFitlers, oldFilters) {
+    var diff = _.difference(oldFilters, newFitlers);
+    return (diff.length && _.every(diff, pluckDisabled));
+  };
+});
diff --git a/src/kibana/plugins/dashboard/index.js b/src/kibana/plugins/dashboard/index.js
index 6f49ce50d771..ece24c6b6d5e 100644
--- a/src/kibana/plugins/dashboard/index.js
+++ b/src/kibana/plugins/dashboard/index.js
@@ -2,6 +2,7 @@ define(function (require) {
   var _ = require('lodash');
   var $ = require('jquery');
   var ConfigTemplate = require('utils/config_template');
+  var onlyDisabled = require('components/filter_bar/lib/onlyDisabled');
 
   require('directives/config');
   require('components/courier/courier');
@@ -115,7 +116,8 @@ define(function (require) {
           }
         }
 
-        $scope.$watch('state.filters', function () {
+        $scope.$watch('state.filters', function (newFilters, oldFilters) {
+          if (onlyDisabled(newFilters, oldFilters)) return;
           $scope.filterResults();
         });
 
diff --git a/src/kibana/plugins/discover/controllers/discover.js b/src/kibana/plugins/discover/controllers/discover.js
index c55c182ccfb0..a52980492457 100644
--- a/src/kibana/plugins/discover/controllers/discover.js
+++ b/src/kibana/plugins/discover/controllers/discover.js
@@ -5,6 +5,7 @@ define(function (require) {
   var settingsHtml = require('text!plugins/discover/partials/settings.html');
   var saveHtml = require('text!plugins/discover/partials/save_search.html');
   var loadHtml = require('text!plugins/discover/partials/load_search.html');
+  var onlyDisabled = require('components/filter_bar/lib/onlyDisabled');
 
   var interval = require('utils/interval');
   var datemath = require('utils/datemath');
@@ -175,7 +176,8 @@ define(function (require) {
           if (!angular.equals(sort, currentSort)) $scope.fetch();
         });
 
-        $scope.$watch('state.filters', function (filters) {
+        $scope.$watch('state.filters', function (newFilters, oldFilters) {
+          if (onlyDisabled(newFilters, oldFilters)) return;
           $scope.fetch();
         });
 
diff --git a/test/unit/specs/components/filter_bar/onlyDisabled.js b/test/unit/specs/components/filter_bar/onlyDisabled.js
new file mode 100644
index 000000000000..4615be6f7f89
--- /dev/null
+++ b/test/unit/specs/components/filter_bar/onlyDisabled.js
@@ -0,0 +1,28 @@
+define(function (require) {
+  var onlyDisabled = require('components/filter_bar/lib/onlyDisabled');
+  describe('Filter Bar Directive', function () {
+    describe('onlyDisabled()', function () {
+
+      it('should return true if all filters remove are disabled', function () {
+        var filters = [
+          { meta: { disabled: true } },
+          { meta: { disabled: false } },
+          { meta: { disabled: true } }
+        ];
+        var newFilters = [filters[1]];
+        expect(onlyDisabled(newFilters, filters)).to.be(true);
+      });
+
+      it('should return true if all filters remove are disabled', function () {
+        var filters = [
+          { meta: { disabled: true } },
+          { meta: { disabled: false } },
+          { meta: { disabled: false } }
+        ];
+        var newFilters = [filters[1]];
+        expect(onlyDisabled(newFilters, filters)).to.be(false);
+      });
+
+    });
+  });
+});

From efcc4a42c8c2ae4c7e2ebcd8560ce99c11f2d7cc Mon Sep 17 00:00:00 2001
From: lukasolson <olson.lukas@gmail.com>
Date: Thu, 18 Dec 2014 13:46:20 -0700
Subject: [PATCH 34/57] Fix discover field detail messages not updating when
 document results change (#2249)

---
 .../components/field_chooser/discover_field_details.html    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/kibana/plugins/discover/components/field_chooser/discover_field_details.html b/src/kibana/plugins/discover/components/field_chooser/discover_field_details.html
index 3b00169555ea..a4e7216b6e2f 100644
--- a/src/kibana/plugins/discover/components/field_chooser/discover_field_details.html
+++ b/src/kibana/plugins/discover/components/field_chooser/discover_field_details.html
@@ -1,7 +1,7 @@
       <div bindonce>
         <div class="discover-field-details">
           <h5 ng-show="!field.details.error">Quick Count
-            <span bo-if="!field.details.error" class="small discover-field-details-count">
+            <span ng-if="!field.details.error" class="small discover-field-details-count">
               (
               <a ng-show="field.indexed" ng-click="updateFilterInQuery('_exists_', field.name, '+')">{{field.details.exists}}</a>
               <span ng-show="!field.indexed">{{field.details.exists}}</span>
@@ -12,9 +12,9 @@ <h5 ng-show="!field.details.error">Quick Count
 
           <div class="clearfix"></div>
 
-          <div bo-if="field.details.error" class="discover-field-details-error">{{field.details.error}}</div>
+          <div ng-if="field.details.error" class="discover-field-details-error">{{field.details.error}}</div>
 
-          <div bo-if="!field.details.error">
+          <div ng-if="!field.details.error">
             <div ng-repeat="bucket in field.details.buckets" class="discover-field-details-item">
               <div>
                 <span ng-show="field.filterable" class="pull-right">

From 5ff3ac62c5433265e974b8cd5fbada4de154ee23 Mon Sep 17 00:00:00 2001
From: Rashid Khan <rashidkpc@gmail.com>
Date: Thu, 18 Dec 2014 14:12:26 -0700
Subject: [PATCH 35/57] Add scripting requirement to README.md. Closes #2382

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 8ee5ec969998..f2ed40c6a035 100644
--- a/README.md
+++ b/README.md
@@ -22,6 +22,8 @@ Kibana is an open source (Apache Licensed), browser based analytics and search d
 - Elasticsearch version 1.4.0 or later
 - ...and nothing else
 
+*Note:* Groovy scripting must be enabled in Elasticsearch
+
 ## Installation
 
 * Download: [http://www.elasticsearch.org/overview/kibana/installation/](http://www.elasticsearch.org/overview/kibana/installation/)

From cf04c8075f78ee0bc7d27c559900e6ab01816a3d Mon Sep 17 00:00:00 2001
From: Chris Cowan <chris@chriscowan.us>
Date: Thu, 18 Dec 2014 15:35:03 -0800
Subject: [PATCH 36/57] Adding to visualize

---
 src/kibana/plugins/visualize/editor/editor.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/kibana/plugins/visualize/editor/editor.js b/src/kibana/plugins/visualize/editor/editor.js
index 6378a067ef19..31232825e450 100644
--- a/src/kibana/plugins/visualize/editor/editor.js
+++ b/src/kibana/plugins/visualize/editor/editor.js
@@ -49,6 +49,7 @@ define(function (require) {
   .controller('VisEditor', function ($scope, $route, timefilter, AppState, $location, kbnUrl, $timeout, courier, Private, Promise) {
 
     var _ = require('lodash');
+    var onlyDisabled = require('components/filter_bar/lib/onlyDisabled');
     var angular = require('angular');
     var ConfigTemplate = require('utils/config_template');
     var Notifier = require('components/notify/_notifier');
@@ -143,6 +144,7 @@ define(function (require) {
       });
 
       $scope.$watch('state.filters', function (newFilters, oldFilters) {
+        if (onlyDisabled(newFilters, oldFilters)) return;
         if (newFilters !== oldFilters) $scope.fetch();
       });
 

From 8a8526d4e381b10ea717d7d56b22996d80781d3b Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Thu, 18 Dec 2014 18:36:57 -0700
Subject: [PATCH 37/57] [courier] refactored request queue, allowing requests
 to be restarted

---
 .../components/courier/_pending_requests.js   |  10 --
 .../components/courier/_request_queue.js      |  42 ++++++
 src/kibana/components/courier/courier.js      |   6 +-
 .../courier/data_source/_abstract.js          |  51 ++-----
 .../courier/data_source/_doc_send_to_es.js    |   9 +-
 .../courier/data_source/doc_source.js         |   5 +
 .../courier/data_source/search_source.js      |  30 ++--
 .../components/courier/fetch/_fetch_these.js  | 139 +++++++++++-------
 .../courier/fetch/_for_each_strategy.js       |  25 +---
 .../components/courier/fetch/_init_request.js |  17 ---
 .../courier/fetch/_request_complete.js        |  29 ----
 src/kibana/components/courier/fetch/fetch.js  |   4 +-
 .../_error_handler.js}                        |   4 +-
 .../components/courier/fetch/request/doc.js   |  46 ++++++
 .../courier/fetch/request/request.js          |  91 ++++++++++++
 .../courier/fetch/request/search.js           |  29 ++++
 .../courier/fetch/request/segmented.js        |  56 +++++++
 .../courier/fetch/segmented_state.js          |   8 +-
 .../components/courier/fetch/strategy/doc.js  |  44 ------
 .../courier/fetch/strategy/search.js          |  47 ------
 .../courier/fetch/strategy/segmented.js       |  54 +------
 .../components/timepicker/timepicker.js       |   1 +
 src/kibana/plugins/kibana/index.js            |  18 ++-
 src/kibana/plugins/kibana/kibana.html         |   4 +
 .../saved_visualizations/_saved_vis.js        |  34 ++++-
 src/kibana/utils/_mixins.js                   |   2 +-
 .../courier/fetch/_segmented_state.js         |   6 +-
 27 files changed, 459 insertions(+), 352 deletions(-)
 delete mode 100644 src/kibana/components/courier/_pending_requests.js
 create mode 100644 src/kibana/components/courier/_request_queue.js
 delete mode 100644 src/kibana/components/courier/fetch/_init_request.js
 delete mode 100644 src/kibana/components/courier/fetch/_request_complete.js
 rename src/kibana/components/courier/fetch/{_request_error_handler.js => request/_error_handler.js} (85%)
 create mode 100644 src/kibana/components/courier/fetch/request/doc.js
 create mode 100644 src/kibana/components/courier/fetch/request/request.js
 create mode 100644 src/kibana/components/courier/fetch/request/search.js
 create mode 100644 src/kibana/components/courier/fetch/request/segmented.js

diff --git a/src/kibana/components/courier/_pending_requests.js b/src/kibana/components/courier/_pending_requests.js
deleted file mode 100644
index 8c7e2c85e3b3..000000000000
--- a/src/kibana/components/courier/_pending_requests.js
+++ /dev/null
@@ -1,10 +0,0 @@
-define(function (require) {
-  return function PendingRequestList() {
-    /**
-     * Queue of pending requests, requests are removed as
-     * they are processed by fetch.[sourceType]().
-     * @type {Array}
-     */
-    return [];
-  };
-});
\ No newline at end of file
diff --git a/src/kibana/components/courier/_request_queue.js b/src/kibana/components/courier/_request_queue.js
new file mode 100644
index 000000000000..910343b8c10b
--- /dev/null
+++ b/src/kibana/components/courier/_request_queue.js
@@ -0,0 +1,42 @@
+define(function (require) {
+  return function PendingRequestList() {
+    var _ = require('lodash');
+
+    /**
+     * Queue of pending requests, requests are removed as
+     * they are processed by fetch.[sourceType]().
+     * @type {Array}
+     */
+    var queue = window.requestQueue = [];
+
+    function getQualified(strategies, started, qualify) {
+      return queue.filter(function (req) {
+        if (req.started !== started) return false;
+
+        var strategyMatch = !strategies.length;
+        if (!strategyMatch) {
+          strategyMatch = strategies.some(function (strategy) {
+            return req.strategy === strategy;
+          });
+        }
+
+        return strategyMatch && qualify(req);
+      });
+    }
+
+    queue.getPending = function (/* strategies.. */) {
+      return getQualified(_.toArray(arguments), false, function (req) {
+        return req.isReady();
+      });
+    };
+
+
+    queue.getIncomplete = function (/* strategies.. */) {
+      return getQualified(_.toArray(arguments), false, function (req) {
+        return req.isIncomplete();
+      });
+    };
+
+    return queue;
+  };
+});
\ No newline at end of file
diff --git a/src/kibana/components/courier/courier.js b/src/kibana/components/courier/courier.js
index 9aadf4153400..2f33a916160b 100644
--- a/src/kibana/components/courier/courier.js
+++ b/src/kibana/components/courier/courier.js
@@ -14,7 +14,7 @@ define(function (require) {
       var DocSource = Private(require('components/courier/data_source/doc_source'));
       var SearchSource = Private(require('components/courier/data_source/search_source'));
 
-      var pendingRequests = Private(require('components/courier/_pending_requests'));
+      var requestQueue = Private(require('components/courier/_request_queue'));
 
       var fetch = Private(require('components/courier/fetch/fetch'));
       var docLooper = self.docLooper = Private(require('components/courier/looper/doc'));
@@ -111,12 +111,12 @@ define(function (require) {
         searchLooper.stop();
         docLooper.stop();
 
-        [].concat(pendingRequests.splice(0), this._errorHandlers.splice(0))
+        [].concat(requestQueue.splice(0), this._errorHandlers.splice(0))
         .forEach(function (req) {
           req.defer.reject(new Abort());
         });
 
-        if (pendingRequests.length) {
+        if (requestQueue.length) {
           throw new Error('Aborting all pending requests failed.');
         }
       };
diff --git a/src/kibana/components/courier/data_source/_abstract.js b/src/kibana/components/courier/data_source/_abstract.js
index 33a657c87371..8495666174eb 100644
--- a/src/kibana/components/courier/data_source/_abstract.js
+++ b/src/kibana/components/courier/data_source/_abstract.js
@@ -4,7 +4,7 @@ define(function (require) {
   var nextTick = require('utils/next_tick');
 
   return function SourceAbstractFactory(Private, Promise, PromiseEmitter, timefilter) {
-    var pendingRequests = Private(require('components/courier/_pending_requests'));
+    var requestQueue = Private(require('components/courier/_request_queue'));
     var errorHandlers = Private(require('components/courier/_error_handlers'));
     var courierFetch = Private(require('components/courier/fetch/fetch'));
 
@@ -124,7 +124,7 @@ define(function (require) {
 
       return new PromiseEmitter(function (resolve, reject, defer) {
         var req = self._createRequest(defer);
-        pendingRequests.push(req);
+        requestQueue.push(req);
       }, handler);
     };
 
@@ -165,7 +165,7 @@ define(function (require) {
       var req = _.first(self._myPending());
       if (!req) {
         req = self._createRequest();
-        pendingRequests.push(req);
+        requestQueue.push(req);
       }
 
       self.fetchPending();
@@ -177,15 +177,18 @@ define(function (require) {
      * @async
      */
     SourceAbstract.prototype.fetchPending = function () {
-      return courierFetch.these(this._pullMyPending());
+      return courierFetch.these(this._myPending());
     };
 
     /**
      * Cancel all pending requests for this dataSource
      * @return {undefined}
      */
-    SourceAbstract.prototype.cancelPending = function () {
-      this._pullMyPending();
+    SourceAbstract.prototype.cancelPending = function (includeStarted) {
+      _(this._myPending(includeStarted)).forEach(function (req) {
+        req.cancel();
+        _.pull(requestQueue, req);
+      });
     };
 
     /**
@@ -193,45 +196,19 @@ define(function (require) {
      * @return {undefined}
      */
     SourceAbstract.prototype.destroy = function () {
-      this.cancelPending();
+      this.cancelPending(true);
     };
 
     /*****
      * PRIVATE API
      *****/
 
-    SourceAbstract.prototype._myPending = function () {
-      return _.where(pendingRequests, { source: this });
-    };
-
-    SourceAbstract.prototype._pullMyPending = function () {
-      var self = this;
-      return pendingRequests.splice(0).filter(function (req) {
-        if (req.source !== self) {
-          pendingRequests.push(req);
-          return false;
-        }
-        return true;
-      });
+    SourceAbstract.prototype._myPending = function (includeStarted) {
+      return _.where(requestQueue, { source: this, started: !!includeStarted });
     };
 
     SourceAbstract.prototype._createRequest = function (defer) {
-      var self = this;
-
-      var req = {
-        source: self,
-        defer: defer || Promise.defer(),
-        strategy: self._fetchStrategy
-      };
-
-      if (self.history) {
-        // latest history at the top
-        self.history.unshift(req);
-        // trim all entries beyond 19/20
-        self.history.splice(20);
-      }
-
-      return req;
+      throw new Error('_createRequest must be implemented by subclass');
     };
 
     /**
@@ -279,6 +256,8 @@ define(function (require) {
       }())
       .then(function () {
         if (type === 'search') {
+          flatState.body = flatState.body || {};
+
           // defaults for the query
           if (!flatState.body.query) {
             flatState.body.query = {
diff --git a/src/kibana/components/courier/data_source/_doc_send_to_es.js b/src/kibana/components/courier/data_source/_doc_send_to_es.js
index 3c760ec269c5..6eca252b216d 100644
--- a/src/kibana/components/courier/data_source/_doc_send_to_es.js
+++ b/src/kibana/components/courier/data_source/_doc_send_to_es.js
@@ -3,7 +3,8 @@ define(function (require) {
   var errors = require('errors');
 
   return function (Promise, Private, es) {
-    var pendingRequests = Private(require('components/courier/_pending_requests'));
+    var requestQueue = Private(require('components/courier/_request_queue'));
+    var docStrategy = Private(require('components/courier/fetch/strategy/doc'));
 
     /**
      * Backend for doUpdate and doIndex
@@ -44,18 +45,18 @@ define(function (require) {
 
           // clear the queue and filter out the removed items, pushing the
           // unmatched ones back in.
-          pendingRequests.splice(0).filter(function (req) {
+          requestQueue.splice(0).filter(function (req) {
             var isDoc = req.source._getType() === 'doc';
             var keyMatches = isDoc && req.source._versionKey() === key;
 
             if (keyMatches) {
               // resolve the request with a copy of the response
-              req.defer.resolve(_.cloneDeep(fetchResp));
+              req.resolve(_.cloneDeep(fetchResp));
               return;
             }
 
             // otherwise, put the request back into the queue
-            pendingRequests.push(req);
+            requestQueue.push(req);
           });
         });
 
diff --git a/src/kibana/components/courier/data_source/doc_source.js b/src/kibana/components/courier/data_source/doc_source.js
index e1cad9140398..b02c67f1b274 100644
--- a/src/kibana/components/courier/data_source/doc_source.js
+++ b/src/kibana/components/courier/data_source/doc_source.js
@@ -7,6 +7,7 @@ define(function (require) {
   return function DocSourceFactory(Private, Promise, es, sessionStorage) {
     var sendToEs = Private(require('components/courier/data_source/_doc_send_to_es'));
     var SourceAbstract = Private(require('components/courier/data_source/_abstract'));
+    var DocRequest = Private(require('components/courier/fetch/request/doc'));
 
     var VersionConflict = errors.VersionConflict;
     var RequestFailure = errors.RequestFailure;
@@ -23,6 +24,10 @@ define(function (require) {
      * PUBLIC API
      *****/
 
+    DocSource.prototype._createRequest = function (defer) {
+      return new DocRequest(this, defer);
+    };
+
     /**
      * List of methods that is turned into a chainable API in the constructor
      * @type {Array}
diff --git a/src/kibana/components/courier/data_source/search_source.js b/src/kibana/components/courier/data_source/search_source.js
index d6b2575eec62..0249f6df9279 100644
--- a/src/kibana/components/courier/data_source/search_source.js
+++ b/src/kibana/components/courier/data_source/search_source.js
@@ -4,8 +4,9 @@ define(function (require) {
     var _ = require('lodash');
     var errors = require('errors');
     var SourceAbstract = Private(require('components/courier/data_source/_abstract'));
-    var pendingRequests = Private(require('components/courier/_pending_requests'));
-    var segmentedStrategy = Private(require('components/courier/fetch/strategy/segmented'));
+    var requestQueue = Private(require('components/courier/_request_queue'));
+    var SearchRequest = Private(require('components/courier/fetch/request/search'));
+    var SegmentedRequest = Private(require('components/courier/fetch/request/segmented'));
 
     var FetchFailure = errors.FetchFailure;
     var RequestFailure = errors.RequestFailure;
@@ -127,18 +128,13 @@ define(function (require) {
       return normal;
     };
 
-    SearchSource.prototype.onBeginSegmentedFetch = function (init) {
+    SearchSource.prototype.onBeginSegmentedFetch = function (initFunction) {
       var self = this;
       return Promise.try(function addRequest() {
         var defer = Promise.defer();
+        var req = new SegmentedRequest(self, defer, initFunction);
 
-        var req = self._createRequest(defer);
-        // add a couple items to this request to identify it as a segmented fetch request
-        req.segmented = true;
-        req.strategy = segmentedStrategy;
-        req.init = init;
-
-        pendingRequests.push(req);
+        requestQueue.push(req);
 
         // return promises created by the completion handler so that
         // errors will bubble properly
@@ -146,6 +142,7 @@ define(function (require) {
       });
     };
 
+
     /******
      * PRIVATE APIS
      ******/
@@ -158,6 +155,19 @@ define(function (require) {
       return 'search';
     };
 
+    /**
+     * Create a common search request object, which should
+     * be put into the pending request queye, for this search
+     * source
+     *
+     * @param {Deferred} defer - the deferred object that should be resolved
+     *                         when the request is complete
+     * @return {SearchRequest}
+     */
+    SearchSource.prototype._createRequest = function (defer) {
+      return new SearchRequest(this, defer);
+    };
+
     /**
      * Used to merge properties into the state within ._flatten().
      * The state is passed in and modified by the function
diff --git a/src/kibana/components/courier/fetch/_fetch_these.js b/src/kibana/components/courier/fetch/_fetch_these.js
index d5fab7dd9014..dc5864d711d6 100644
--- a/src/kibana/components/courier/fetch/_fetch_these.js
+++ b/src/kibana/components/courier/fetch/_fetch_these.js
@@ -1,71 +1,96 @@
 define(function (require) {
-  return function FetchTheseProvider(Private, Promise, es, Notifier, sessionId, configFile) {
+  return function FetchTheseProvider(Private, Promise, es, sessionId, configFile) {
     var _ = require('lodash');
 
-    var initRequest = Private(require('components/courier/fetch/_init_request'));
-    var reqComplete = Private(require('components/courier/fetch/_request_complete'));
+    var errors = require('errors');
+    var Notifier = require('components/notify/_notifier');
+
+    var requestQueue = Private(require('components/courier/_request_queue'));
     var forEachStrategy = Private(require('components/courier/fetch/_for_each_strategy'));
-    var requestErrorHandler = Private(require('components/courier/fetch/_request_error_handler'));
     var mergeDuplicateRequests = Private(require('components/courier/fetch/_merge_duplicate_requests'));
 
+    var notify = new Notifier({
+      location: 'Courier Fetch'
+    });
 
     function fetchThese(requests) {
-      return forEachStrategy(requests, function (requests, strategy) {
-        requests.forEach(initRequest);
-
-        var uniq = mergeDuplicateRequests(requests);
-        var states;
-        var responses;
-
-        return Promise.map(uniq, function (req) {
-          return strategy.getSourceStateFromRequest(req);
-        })
-        .then(function (_states_) {
-          states = _states_;
-
-          // all requests must have been disabled
-          if (!states.length) return Promise.resolve(false);
-
-          return es[strategy.clientMethod]({
-            timeout: configFile.shard_timeout,
-            preference: sessionId,
-            body: strategy.convertStatesToBody(states)
-          });
-        })
-        .then(strategy.getResponses)
-        .then(function (_responses_) {
-          responses = _responses_;
-
-          return Promise.all(responses.map(function (resp) {
-            var req = uniq.shift();
-            var state = states.shift();
-            if (!req._merged) {
-              req.state = state;
-              return reqComplete(req, resp);
-            } else {
-              return Promise.all(req._merged.map(function (mergedReq) {
-                mergedReq.state = state;
-                var respClone = _.cloneDeep(resp);
-                return reqComplete(mergedReq, respClone);
-              }));
-            }
-          }));
-        })
-        .then(function () {
-          return responses;
-        })
-        .catch(function (err) {
-          function sendFailure(req) {
-            req.source.activeFetchCount -= 1;
-            requestErrorHandler(req, err);
+      return forEachStrategy(requests, function fetchRequestsWithStrategy(requests, strategy) {
+        return executeFetch(requests, strategy)
+        .then(function checkForIncompleteRequests(result) {
+          var incomplete = requestQueue.getIncomplete(strategy);
+          if (incomplete.length) {
+            return fetchRequestsWithStrategy(incomplete, strategy);
           }
 
-          uniq.forEach(function (req) {
-            if (!req._merged) sendFailure(req);
-            else req._merged.forEach(sendFailure);
-          });
-          throw err;
+          return result;
         });
+      })
+      .catch(notify.fatal);
+    }
+
+    function reqComplete(req, resp) {
+      _.pull(requestQueue, req);
+
+      if (resp.timed_out) {
+        notify.warning(new errors.SearchTimeout());
+      }
+
+      return req[resp.error ? 'reject' : 'resolve'](resp);
+    }
+
+    function executeFetch(requests, strategy) {
+      _.invoke(requests, 'start');
+      var uniq = mergeDuplicateRequests(requests);
+      var states;
+      var responses;
+
+      return Promise
+      .map(uniq, strategy.getSourceStateFromRequest)
+      .then(function (_states_) {
+        states = _states_;
+
+        // all requests must have been disabled
+        if (!states.length) return Promise.resolve(false);
+
+        return es[strategy.clientMethod]({
+          timeout: configFile.shard_timeout,
+          preference: sessionId,
+          body: strategy.convertStatesToBody(states)
+        });
+      })
+      .then(strategy.getResponses)
+      .then(function (_responses_) {
+        responses = _responses_;
+
+        return Promise.all(responses.map(function (resp) {
+          var req = uniq.shift();
+          var state = states.shift();
+
+          if (!req._merged) {
+            req.state = state;
+            return reqComplete(req, resp);
+          } else {
+            return Promise.all(req._merged.map(function (mergedReq) {
+              mergedReq.state = state;
+              return reqComplete(mergedReq, _.cloneDeep(resp));
+            }));
+          }
+        }));
+      })
+      .then(function () {
+        return responses;
+      })
+      .catch(function (err) {
+        function sendFailure(req) {
+          req.reject(err);
+        }
+
+        uniq.forEach(function (req) {
+          if (!req._merged) sendFailure(req);
+          else req._merged.forEach(sendFailure);
+        });
+
+        throw err;
       });
     }
 
diff --git a/src/kibana/components/courier/fetch/_for_each_strategy.js b/src/kibana/components/courier/fetch/_for_each_strategy.js
index c92db90b1106..a3e22aeb0e52 100644
--- a/src/kibana/components/courier/fetch/_for_each_strategy.js
+++ b/src/kibana/components/courier/fetch/_for_each_strategy.js
@@ -1,11 +1,6 @@
 define(function (require) {
-  return function FetchForEachRequestStrategy(Private, Promise, Notifier) {
+  return function FetchForEachRequestStrategy(Private, Promise) {
     var _ = require('lodash');
-    var pendingRequests = Private(require('components/courier/_pending_requests'));
-
-    var notify = new Notifier({
-      location: 'Courier Fetch'
-    });
 
     function forEachStrategy(requests, block) {
       block = Promise.method(block);
@@ -19,22 +14,8 @@ define(function (require) {
       });
 
       return Promise.all(sets.map(function (set) {
-        return (function fetch(requests, strategy) {
-
-          return block(requests, strategy)
-          .then(function checkForIncompleteRequests(result) {
-            if (_.isFunction(strategy.getIncompleteRequests)) {
-              var incomplete = strategy.getIncompleteRequests(pendingRequests);
-              if (incomplete.length) {
-                return fetch(incomplete, strategy);
-              }
-            }
-            return result;
-          });
-
-        }(set[1], set[0]));
-      }))
-      .catch(notify.fatal);
+        return block(set[1], set[0]);
+      }));
     }
 
     return forEachStrategy;
diff --git a/src/kibana/components/courier/fetch/_init_request.js b/src/kibana/components/courier/fetch/_init_request.js
deleted file mode 100644
index e269abcb07a6..000000000000
--- a/src/kibana/components/courier/fetch/_init_request.js
+++ /dev/null
@@ -1,17 +0,0 @@
-define(function (require) {
-  return function FetchInitRequestProvider() {
-    var moment = require('moment');
-
-    function initRequest(req) {
-      if (req.source.activeFetchCount) {
-        req.source.activeFetchCount += 1;
-      } else {
-        req.source.activeFetchCount = 1;
-      }
-
-      req.moment = moment();
-    }
-
-    return initRequest;
-  };
-});
\ No newline at end of file
diff --git a/src/kibana/components/courier/fetch/_request_complete.js b/src/kibana/components/courier/fetch/_request_complete.js
deleted file mode 100644
index 4bec56904498..000000000000
--- a/src/kibana/components/courier/fetch/_request_complete.js
+++ /dev/null
@@ -1,29 +0,0 @@
-define(function (require) {
-  return function FetchRequestCompleteProvider(Private, Notifier) {
-    var errors = require('errors');
-    var requestErrorHandler = Private(require('components/courier/fetch/_request_error_handler'));
-
-    var notify = new Notifier({
-      location: 'Courier Fetch'
-    });
-
-    function reqComplete(req, resp) {
-      if (resp.timed_out) {
-        notify.warning(new errors.SearchTimeout());
-      }
-
-      req.complete = true;
-      req.resp = resp;
-      req.ms = req.moment.diff() * -1;
-      req.source.activeFetchCount -= 1;
-
-      if (resp.error) {
-        return requestErrorHandler(req, new errors.FetchFailure(resp));
-      }
-
-      return req.strategy.resolveRequest(req, resp);
-    }
-
-    return reqComplete;
-  };
-});
\ No newline at end of file
diff --git a/src/kibana/components/courier/fetch/fetch.js b/src/kibana/components/courier/fetch/fetch.js
index f52109442349..3a1488d40b53 100644
--- a/src/kibana/components/courier/fetch/fetch.js
+++ b/src/kibana/components/courier/fetch/fetch.js
@@ -8,11 +8,11 @@ define(function (require) {
       segmented: Private(require('components/courier/fetch/strategy/segmented'))
     };
 
-    var pendingRequests = Private(require('components/courier/_pending_requests'));
+    var requestQueue = Private(require('components/courier/_request_queue'));
     var fetchThese = Private(require('components/courier/fetch/_fetch_these'));
 
     function fetchPending(strategy) {
-      var requests = strategy.getPendingRequests(pendingRequests);
+      var requests = requestQueue.getPending(strategy);
       if (!requests.length) return Promise.resolve();
       else return fetchThese(requests);
     }
diff --git a/src/kibana/components/courier/fetch/_request_error_handler.js b/src/kibana/components/courier/fetch/request/_error_handler.js
similarity index 85%
rename from src/kibana/components/courier/fetch/_request_error_handler.js
rename to src/kibana/components/courier/fetch/request/_error_handler.js
index d6dae8cd6214..53dfac32d580 100644
--- a/src/kibana/components/courier/fetch/_request_error_handler.js
+++ b/src/kibana/components/courier/fetch/request/_error_handler.js
@@ -1,6 +1,6 @@
 define(function (require) {
   return function RequestErrorHandlerFactory(Private, Notifier) {
-    var pendingRequests = Private(require('components/courier/_pending_requests'));
+    var requestQueue = Private(require('components/courier/_request_queue'));
     var errorHandlers = Private(require('components/courier/_error_handlers'));
 
     var notify = new Notifier({
@@ -8,7 +8,7 @@ define(function (require) {
     });
 
     function handleError(req, error) {
-      pendingRequests.push(req);
+      requestQueue.push(req);
 
       var handlerCount = 0;
       errorHandlers.splice(0).forEach(function (handler) {
diff --git a/src/kibana/components/courier/fetch/request/doc.js b/src/kibana/components/courier/fetch/request/doc.js
new file mode 100644
index 000000000000..d5138d79ef49
--- /dev/null
+++ b/src/kibana/components/courier/fetch/request/doc.js
@@ -0,0 +1,46 @@
+define(function (require) {
+  return function DocRequestProvider(Private) {
+    var _ = require('lodash');
+
+    var strategy = Private(require('components/courier/fetch/strategy/doc'));
+    var AbstractRequest = Private(require('components/courier/fetch/request/request'));
+
+    _(DocRequest).inherits(AbstractRequest);
+    function DocRequest(source, defer) {
+      DocRequest.Super.call(this, source, defer);
+    }
+
+    DocRequest.prototype.type = 'doc';
+    DocRequest.prototype.strategy = strategy;
+
+    DocRequest.prototype.isReady = function () {
+      var parent = DocRequest.Super.prototype.isReady.call(this);
+      if (!parent) return false;
+
+      // _getStoredVersion updates the internal
+      // cache returned by _getVersion, so _getVersion
+      // must be called first
+      var version = this.source._getVersion();
+      var storedVersion = this.source._getStoredVersion();
+
+      // conditions that equal "fetch This DOC!"
+      var unknownVersion = !version && !storedVersion;
+      var versionMismatch = version !== storedVersion;
+      var localVersionCleared = version && !storedVersion;
+
+      if (unknownVersion || versionMismatch || localVersionCleared) return true;
+    };
+
+    DocRequest.prototype.resolve = function (resp) {
+      if (resp.found) {
+        this.source._storeVersion(resp._version);
+      } else {
+        this.source._clearVersion();
+      }
+
+      return DocRequest.Super.prototype.resolve.call(this, resp);
+    };
+
+    return DocRequest;
+  };
+});
\ No newline at end of file
diff --git a/src/kibana/components/courier/fetch/request/request.js b/src/kibana/components/courier/fetch/request/request.js
new file mode 100644
index 000000000000..9e29437f59d6
--- /dev/null
+++ b/src/kibana/components/courier/fetch/request/request.js
@@ -0,0 +1,91 @@
+define(function (require) {
+  return function GenericRequestProvider(Private, Promise) {
+    var _ = require('lodash');
+    var moment = require('moment');
+    var errors = require('errors');
+    var requestErrorHandler = Private(require('components/courier/fetch/request/_error_handler'));
+
+    function GenericRequest(source, defer) {
+      if (!(this instanceof GenericRequest) || !this.constructor || this.constructor === GenericRequest) {
+        throw new Error('The GenericRequest class should not be called directly');
+      }
+
+      this.source = source;
+      this.defer = defer || Promise.defer();
+      this.started = false;
+    }
+
+
+    GenericRequest.prototype.isReady = function () {
+      return !this.source._fetchDisabled;
+    };
+
+
+    GenericRequest.prototype.isIncomplete = function () {
+      return false;
+    };
+
+
+    GenericRequest.prototype.start = function () {
+      if (this.started) {
+        throw new TypeError('Unable to start request because it has already started');
+      }
+
+      this.started = true;
+      this.moment = moment();
+
+      var source = this.source;
+      if (source.activeFetchCount) {
+        source.activeFetchCount += 1;
+      } else {
+        source.activeFetchCount = 1;
+      }
+
+      var history = source.history;
+      if (history) {
+        history = _.first(history.concat(this), 20);
+      }
+    };
+
+
+    GenericRequest.prototype.stop = function () {
+      if (this.complete) {
+        throw new TypeError('Unable to stop request because it has already stopped');
+      }
+
+      this.ms = this.moment.diff() * -1;
+      this.complete = true;
+      this.source.activeFetchCount -= 1;
+    };
+
+
+    GenericRequest.prototype.resolve = function (resp) {
+      this.stop();
+      this.success = true;
+      this.resp = resp;
+      return this.defer.resolve(resp);
+    };
+
+
+    GenericRequest.prototype.reject = function (resp) {
+      this.stop();
+      this.success = false;
+      this.resp = resp;
+      return requestErrorHandler(this, new errors.FetchFailure(this));
+    };
+
+
+    GenericRequest.prototype.clone = function () {
+      return new this.constructor(this.source, this.defer);
+    };
+
+
+    GenericRequest.prototype.cancel = function () {
+      this.defer = null;
+      this.started = false;
+      this.canceled = true;
+    };
+
+    return GenericRequest;
+  };
+});
\ No newline at end of file
diff --git a/src/kibana/components/courier/fetch/request/search.js b/src/kibana/components/courier/fetch/request/search.js
new file mode 100644
index 000000000000..f0e807460a5c
--- /dev/null
+++ b/src/kibana/components/courier/fetch/request/search.js
@@ -0,0 +1,29 @@
+define(function (require) {
+  return function SearchRequestProvider(Private) {
+    var _ = require('lodash');
+
+    var strategy = Private(require('components/courier/fetch/strategy/search'));
+    var AbstractRequest = Private(require('components/courier/fetch/request/request'));
+
+    _(SearchRequest).inherits(AbstractRequest);
+    var Super = SearchRequest.Super;
+    function SearchRequest(source, defer) {
+      Super.call(this, source, defer);
+    }
+
+    SearchRequest.prototype.type = 'search';
+    SearchRequest.prototype.strategy = strategy;
+
+    SearchRequest.prototype.resolve = function (resp) {
+      if (resp && resp.hits) {
+        resp.hits.hits.forEach(function (hit) {
+          hit._source = _.flattenWith('.', hit._source);
+        });
+      }
+
+      return Super.prototype.resolve.call(this, resp);
+    };
+
+    return SearchRequest;
+  };
+});
\ No newline at end of file
diff --git a/src/kibana/components/courier/fetch/request/segmented.js b/src/kibana/components/courier/fetch/request/segmented.js
new file mode 100644
index 000000000000..8a014ead61e2
--- /dev/null
+++ b/src/kibana/components/courier/fetch/request/segmented.js
@@ -0,0 +1,56 @@
+define(function (require) {
+  return function SegmentedRequestProvider(Private) {
+    var _ = require('lodash');
+
+    var strategy = Private(require('components/courier/fetch/strategy/segmented'));
+    var SearchRequest = Private(require('components/courier/fetch/request/search'));
+    var SegmentedState = Private(require('components/courier/fetch/segmented_state'));
+    var requestQueue = Private(require('components/courier/_request_queue'));
+
+    _(SegmentedRequest).inherits(SearchRequest);
+    function SegmentedRequest(source, defer, initFn) {
+      SegmentedRequest.Super.call(this, source, defer);
+
+      this.initFn;
+
+      if (_.isFunction(initFn)) {
+        this.segState = new SegmentedState(source, initFn);
+        // generate requests for all upcomming segments and push into the request queue
+        _.range(this.segState.all.length - 1)
+        .reduce(function (prev) {
+          var next = prev.next = prev.getNext();
+          next.prev = prev;
+          next.segState = prev.segState;
+          requestQueue.push(next);
+          return next;
+        }, this);
+      }
+    }
+
+    SegmentedRequest.prototype.type = 'segmented';
+
+
+    SegmentedRequest.prototype.clone = function () {
+      return new SegmentedRequest(this.source, this.defer, this.initFn);
+    };
+
+
+    SegmentedRequest.prototype.getNext = SegmentedRequest.Super.prototype.clone;
+
+
+    SegmentedRequest.prototype.strategy = strategy;
+
+
+    SegmentedRequest.prototype.isReady = function () {
+      var parent = SegmentedRequest.Super.prototype.isReady.call(this);
+      return parent && !this.prev;
+    };
+
+
+    SegmentedRequest.prototype.isIncomplete = function () {
+      return this.prev && this.prev.complete === true;
+    };
+
+    return SegmentedRequest;
+  };
+});
\ No newline at end of file
diff --git a/src/kibana/components/courier/fetch/segmented_state.js b/src/kibana/components/courier/fetch/segmented_state.js
index 5c6fc0d9ce15..be8eb2b6e824 100644
--- a/src/kibana/components/courier/fetch/segmented_state.js
+++ b/src/kibana/components/courier/fetch/segmented_state.js
@@ -2,7 +2,6 @@ define(function (require) {
   return function CourierSegmentedStateProvider(es, Private, Promise, Notifier, timefilter) {
     var _ = require('lodash');
     var Events = Private(require('factories/events'));
-    var pendingRequests = Private(require('components/courier/_pending_requests'));
 
     var notify = new Notifier({
       location: 'Segmented Fetch'
@@ -13,7 +12,6 @@ define(function (require) {
       SegmentedState.Super.call(this);
 
       this.source = source;
-      this.promiseForFlatSource = this.source._flatten();
       this.totalSize = false;
       this.direction = 'desc';
 
@@ -37,6 +35,10 @@ define(function (require) {
       };
 
       this.emitChain = this.emit('status', this._statusReport(null));
+
+      this.getFlattenedSource = _.once(function () {
+        return this.source._flatten();
+      });
     }
 
     SegmentedState.prototype._statusReport = function (active) {
@@ -52,7 +54,7 @@ define(function (require) {
       var self = this;
       var emits = [];
 
-      return self.promiseForFlatSource.then(function (flatSource) {
+      return self.getFlattenedSource().then(function (flatSource) {
         var first = self.queue.length === self.all.length;
         var index = self.queue.shift();
         var last = self.queue.length === 0;
diff --git a/src/kibana/components/courier/fetch/strategy/doc.js b/src/kibana/components/courier/fetch/strategy/doc.js
index 6e26a44596df..339e9497f0e4 100644
--- a/src/kibana/components/courier/fetch/strategy/doc.js
+++ b/src/kibana/components/courier/fetch/strategy/doc.js
@@ -30,50 +30,6 @@ define(function (require) {
        */
       getResponses: function (resp) {
         return resp.docs;
-      },
-
-      /**
-       * Resolve a single request using a single response from an msearch
-       * @param  {object} req - The request object, with a defer and source property
-       * @param  {object} resp - An object from the mget response's "docs" array
-       * @return {Promise} - the promise created by responding to the request
-       */
-      resolveRequest: function (req, resp) {
-        if (resp.found) {
-          req.source._storeVersion(resp._version);
-        } else {
-          req.source._clearVersion();
-        }
-        return req.defer.resolve(resp);
-      },
-
-      /**
-       * Get the doc requests from the courier that are ready to be fetched
-       * @return {array} - The filtered request list, pulled from
-       *                   the courier's _pendingRequests queue
-       */
-      getPendingRequests: function (pendingRequests) {
-        return pendingRequests.splice(0).filter(function (req) {
-          // filter by type first
-          if (req.source._getType() !== 'doc') {
-            pendingRequests.push(req);
-            return;
-          }
-
-          // _getStoredVersion updates the internal
-          // cache returned by _getVersion, so _getVersion
-          // must be called first
-          var version = req.source._getVersion();
-          var storedVersion = req.source._getStoredVersion();
-
-          // conditions that equal "fetch This DOC!"
-          var unknownVersion = !version && !storedVersion;
-          var versionMismatch = version !== storedVersion;
-          var localVersionCleared = version && !storedVersion;
-
-          if (unknownVersion || versionMismatch || localVersionCleared) return true;
-          else pendingRequests.push(req);
-        });
       }
     };
   };
diff --git a/src/kibana/components/courier/fetch/strategy/search.js b/src/kibana/components/courier/fetch/strategy/search.js
index 32c3d2a46a09..82f08e8c06d6 100644
--- a/src/kibana/components/courier/fetch/strategy/search.js
+++ b/src/kibana/components/courier/fetch/strategy/search.js
@@ -37,53 +37,6 @@ define(function (require) {
        */
       getResponses: function (resp) {
         return resp.responses;
-      },
-
-      /**
-       * Resolve a single request using a single response from an msearch
-       * @param  {object} req - The request object, with a defer and source property
-       * @param  {object} resp - An object from the mget response's "docs" array
-       * @return {Promise} - the promise created by responding to the request
-       */
-      resolveRequest: function (req, resp) {
-        if (resp && resp.hits) {
-          resp.hits.hits.forEach(function (hit) {
-            hit._source = _.flattenWith('.', hit._source);
-          });
-        }
-        req.defer.resolve(resp);
-      },
-
-      /**
-       * Get the doc requests from the courier that are ready to be fetched
-       * @param {array} pendingRequests - The list of pending requests, from
-       *                                  which the requests to make should be
-       *                                  removed
-       * @return {array} - The filtered request list, pulled from
-       *                   the courier's _pendingRequests queue
-       */
-      getPendingRequests: function (pendingRequests) {
-        var self = this;
-        return this._filterPending(pendingRequests, function (req) {
-          return self._validSearch(req) && self._qualifyPending(req);
-        });
-      },
-
-      _filterPending: function (pendingRequests, filter) {
-        return pendingRequests.splice(0).filter(function (req) {
-          if (filter(req)) return true;
-          else pendingRequests.push(req);
-        });
-      },
-
-      _validSearch: function (req) {
-        var isSearch = req.source._getType() === 'search';
-        var isEnabled = isSearch && !req.source._fetchDisabled;
-        return isSearch && isEnabled;
-      },
-
-      _qualifyPending: function (req) {
-        return !req.segmented;
       }
     };
   };
diff --git a/src/kibana/components/courier/fetch/strategy/segmented.js b/src/kibana/components/courier/fetch/strategy/segmented.js
index 0ef9e47b85cf..799fdb6df205 100644
--- a/src/kibana/components/courier/fetch/strategy/segmented.js
+++ b/src/kibana/components/courier/fetch/strategy/segmented.js
@@ -2,8 +2,6 @@ define(function (require) {
   return function FetchStrategyForSegmentedSearch(Private, Promise, Notifier, timefilter, es, configFile) {
     var _ = require('lodash');
     var searchStrategy = Private(require('components/courier/fetch/strategy/search'));
-    var SegmentedState = Private(require('components/courier/fetch/segmented_state'));
-    var pendingRequests = Private(require('components/courier/_pending_requests'));
 
     // extend the client to behave well for this strategy
     es.segmentSafeMsearch = function (params) {
@@ -23,11 +21,7 @@ define(function (require) {
       clientMethod: 'segmentSafeMsearch',
 
       getSourceStateFromRequest: function (req) {
-        if (!(req.segmented instanceof SegmentedState)) {
-          this._setupRequest(req);
-        }
-
-        return req.segmented.getSourceStateFromRequest(req);
+        return req.segState.getSourceStateFromRequest(req);
       },
 
       /**
@@ -47,53 +41,7 @@ define(function (require) {
             + JSON.stringify(state.body);
 
         }).join('\n') + '\n';
-      },
-
-      getIncompleteRequests: function (pendingRequests) {
-        var self = this;
-        return self._filterPending(pendingRequests, function (req) {
-          return self._validSearch(req) && self._qualifyIncomplete(req);
-        });
-      },
-
-      /**
-       * Resolve a single request using a single response from an msearch
-       * @param  {object} req - The request object, with a defer and source property
-       * @param  {object} resp - An object from the mget response's "docs" array
-       * @return {Promise} - the promise created by responding to the request
-       */
-      resolveRequest: function (req, resp) {
-        if (req.next) {
-          req.next.ready = true;
-        }
-
-        return searchStrategy.resolveRequest(req, resp);
-      },
-
-      _qualifyPending: function (req) {
-        return req.segmented === true;
-      },
-
-      _qualifyIncomplete: function (req) {
-        return (req.segmented instanceof SegmentedState) && req.ready;
-      },
-
-      _setupRequest: function (req) {
-        req.segmented = new SegmentedState(req.source, req.init);
-
-        // generate upcomming requests and push into pending requests
-        _.range(req.segmented.all.length - 1).reduce(function (prev) {
-          var next = prev.next = req.source._createRequest(prev.defer);
-
-          next.strategy = prev.strategy;
-          next.segmented = req.segmented;
-          next.ready = false;
-
-          pendingRequests.push(next);
-          return next;
-        }, req);
       }
-
     });
   };
 });
\ No newline at end of file
diff --git a/src/kibana/components/timepicker/timepicker.js b/src/kibana/components/timepicker/timepicker.js
index 207dcfdaa1f9..3dc2c46a1b8d 100644
--- a/src/kibana/components/timepicker/timepicker.js
+++ b/src/kibana/components/timepicker/timepicker.js
@@ -35,6 +35,7 @@ define(function (require) {
 
         $scope.refreshIntervals = [
           { value : 0, display: 'Off'},
+          { value : 100, display: 'Near-Realtime'},
           { value : 5000, display: '5 seconds'},
           { value : 10000, display: '10 seconds'},
           { value : 30000, display: '30 seconds'},
diff --git a/src/kibana/plugins/kibana/index.js b/src/kibana/plugins/kibana/index.js
index 6471ea4a4fd0..f7fb3f8ca8be 100644
--- a/src/kibana/plugins/kibana/index.js
+++ b/src/kibana/plugins/kibana/index.js
@@ -26,10 +26,12 @@ define(function (require) {
 
   // ensure that the kibana module requires ui.bootstrap
   require('modules').get('kibana', ['ui.bootstrap'])
-  .directive('kibana', function ($rootScope, $injector, Promise, config, kbnSetup) {
+  .directive('kibana', function (Private, $rootScope, $injector, Promise, config, kbnSetup) {
     return {
       template: require('text!plugins/kibana/kibana.html'),
+      controllerAs: 'kibana',
       controller: function ($scope) {
+        var _ = require('lodash');
         var self = $rootScope.kibana = this;
         var notify = new Notifier({ location: 'Kibana' });
 
@@ -38,6 +40,20 @@ define(function (require) {
           notify.fatal(err);
         });
 
+        $scope.courierRequestQueue = Private(require('components/courier/_request_queue'));
+        $scope.courierRequestStats = {};
+
+        $rootScope.$watchCollection('courierRequestQueue', function (queue) {
+          _.forOwn($scope.courierRequestStats, function (v, name, stats) {
+            stats[name] = 0;
+          });
+
+          queue.forEach(function (req) {
+            $scope.courierRequestStats[req.type] = ($scope.courierRequestStats[req.type] || 0) + 1;
+          });
+        });
+
+
         // run init functions before loading the mixins, so that we can ensure that
         // the environment is ready for them to get and use their dependencies
         self.ready = Promise.all([ kbnSetup(), config.init() ])
diff --git a/src/kibana/plugins/kibana/kibana.html b/src/kibana/plugins/kibana/kibana.html
index dc15756a8a57..45d5640859ec 100644
--- a/src/kibana/plugins/kibana/kibana.html
+++ b/src/kibana/plugins/kibana/kibana.html
@@ -28,6 +28,10 @@
             <div class="spinner"></div>
           </li>
 
+          <span class="navbar-text" ng-repeat="(name, stat) in courierRequestStats">
+            {{name}}:{{stat}}
+          </span>
+
           <li ng-if="setupComplete" ng-show="timefilter.enabled" class="navbar-timepicker-container">
             <a ng-click="toggleTimepicker()">
               <span ng-show="timefilter.refreshInterval.value > 0" class="navbar-timepicker-auto-refresh-desc">
diff --git a/src/kibana/plugins/visualize/saved_visualizations/_saved_vis.js b/src/kibana/plugins/visualize/saved_visualizations/_saved_vis.js
index fe7f46f2d28b..4205e4024196 100644
--- a/src/kibana/plugins/visualize/saved_visualizations/_saved_vis.js
+++ b/src/kibana/plugins/visualize/saved_visualizations/_saved_vis.js
@@ -50,15 +50,9 @@ define(function (require) {
 
     SavedVis.prototype._afterEsResp = function () {
       var self = this;
-      var linkedSearch = self.savedSearchId;
-
-      return Promise.resolve(linkedSearch && savedSearches.get(linkedSearch))
-      .then(function (parent) {
-        if (parent) {
-          self.savedSearch = parent;
-          self.searchSource.inherits(parent.searchSource);
-        }
 
+      return self._getLinkedSavedSearch()
+      .then(function () {
         self.searchSource.size(0);
 
         return self.vis ? self._updateVis() : self._createVis();
@@ -72,6 +66,30 @@ define(function (require) {
       });
     };
 
+    SavedVis.prototype._getLinkedSavedSearch = Promise.method(function () {
+      var self = this;
+      var linkedSearch = !!self.savedSearchId;
+      var current = self.savedSearch;
+
+      if (linkedSearch && current && current.id === self.savedSearchId) {
+        return;
+      }
+
+      if (self.savedSearch) {
+        self.searchSource.inherits(self.savedSearch.searchSource.getParent());
+        self.savedSearch.destroy();
+        self.savedSearch = null;
+      }
+
+      if (linkedSearch) {
+        return savedSearches.get(self.savedSearchId)
+        .then(function (savedSearch) {
+          self.savedSearch = savedSearch;
+          self.searchSource.inherits(self.savedSearch.searchSource);
+        });
+      }
+    });
+
     SavedVis.prototype._createVis = function () {
       var self = this;
 
diff --git a/src/kibana/utils/_mixins.js b/src/kibana/utils/_mixins.js
index 454d420224cb..435cf7329233 100644
--- a/src/kibana/utils/_mixins.js
+++ b/src/kibana/utils/_mixins.js
@@ -13,7 +13,7 @@ define(function (require) {
   _.mixin(require('lodash-deep'));
   _.mixin({
     inherits: function (Sub, Super) {
-      Sub.prototype = _.create(Super.prototype, { 'constructor': Super });
+      Sub.prototype = _.create(Super.prototype, { 'constructor': Sub });
       Sub.Super = Super;
     },
     remove: function (array, index) {
diff --git a/test/unit/specs/components/courier/fetch/_segmented_state.js b/test/unit/specs/components/courier/fetch/_segmented_state.js
index f9dd3dc554be..a168c3fbe67c 100644
--- a/test/unit/specs/components/courier/fetch/_segmented_state.js
+++ b/test/unit/specs/components/courier/fetch/_segmented_state.js
@@ -8,7 +8,7 @@ define(function (require) {
   var flatSource;
   var indexPattern;
   var SegmentedState;
-  var pendingRequests;
+  var requestQueue;
   var indices = [
     'logstash-2014.12.14',
     'logstash-2014.12.15',
@@ -23,7 +23,7 @@ define(function (require) {
       Promise = $injector.get('Promise');
       $rootScope = $injector.get('$rootScope');
       SegmentedState = Private(require('components/courier/fetch/segmented_state'));
-      pendingRequests = Private(require('components/courier/_pending_requests'));
+      requestQueue = Private(require('components/courier/_request_queue'));
 
       flatSource = {
         index: indices,
@@ -171,7 +171,7 @@ define(function (require) {
 
           // when pending requests are pushed into the pending
           // request queue, filter out the ones we are interested in
-          sinon.stub(pendingRequests, 'push', function (req) {
+          sinon.stub(requestQueue, 'push', function (req) {
             if (req.segmented === state) nextRequest(req);
           });
 

From 61537df6a5521b967b3f6b02201375bf4c3d745b Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Thu, 18 Dec 2014 19:28:07 -0700
Subject: [PATCH 38/57] [courier/segmentedRequest] only init state at request
 time

---
 src/kibana/components/courier/courier.js          |  3 ++-
 .../components/courier/fetch/request/segmented.js | 15 +++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/kibana/components/courier/courier.js b/src/kibana/components/courier/courier.js
index 2f33a916160b..1c6d9a502022 100644
--- a/src/kibana/components/courier/courier.js
+++ b/src/kibana/components/courier/courier.js
@@ -15,6 +15,7 @@ define(function (require) {
       var SearchSource = Private(require('components/courier/data_source/search_source'));
 
       var requestQueue = Private(require('components/courier/_request_queue'));
+      var errorHandlers = Private(require('components/courier/_error_handlers'));
 
       var fetch = Private(require('components/courier/fetch/fetch'));
       var docLooper = self.docLooper = Private(require('components/courier/looper/doc'));
@@ -111,7 +112,7 @@ define(function (require) {
         searchLooper.stop();
         docLooper.stop();
 
-        [].concat(requestQueue.splice(0), this._errorHandlers.splice(0))
+        [].concat(requestQueue.splice(0), errorHandlers.splice(0))
         .forEach(function (req) {
           req.defer.reject(new Abort());
         });
diff --git a/src/kibana/components/courier/fetch/request/segmented.js b/src/kibana/components/courier/fetch/request/segmented.js
index 8a014ead61e2..ce18d0f44735 100644
--- a/src/kibana/components/courier/fetch/request/segmented.js
+++ b/src/kibana/components/courier/fetch/request/segmented.js
@@ -4,17 +4,19 @@ define(function (require) {
 
     var strategy = Private(require('components/courier/fetch/strategy/segmented'));
     var SearchRequest = Private(require('components/courier/fetch/request/search'));
-    var SegmentedState = Private(require('components/courier/fetch/segmented_state'));
+    var SegmentedRequestState = Private(require('components/courier/fetch/segmented_state'));
     var requestQueue = Private(require('components/courier/_request_queue'));
 
     _(SegmentedRequest).inherits(SearchRequest);
     function SegmentedRequest(source, defer, initFn) {
       SegmentedRequest.Super.call(this, source, defer);
+      this.initFn = initFn;
+    }
 
-      this.initFn;
+    SegmentedRequest.prototype.start = function () {
+      if (!this.segState) {
+        this.segState = new SegmentedRequestState(this.source, this.initFn);
 
-      if (_.isFunction(initFn)) {
-        this.segState = new SegmentedState(source, initFn);
         // generate requests for all upcomming segments and push into the request queue
         _.range(this.segState.all.length - 1)
         .reduce(function (prev) {
@@ -25,7 +27,9 @@ define(function (require) {
           return next;
         }, this);
       }
-    }
+
+      return SegmentedRequest.Super.prototype.start.call(this);
+    };
 
     SegmentedRequest.prototype.type = 'segmented';
 
@@ -34,7 +38,6 @@ define(function (require) {
       return new SegmentedRequest(this.source, this.defer, this.initFn);
     };
 
-
     SegmentedRequest.prototype.getNext = SegmentedRequest.Super.prototype.clone;
 
 

From 0a07e71f0b3c1fbd40cd569ffca48ced36f79139 Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Thu, 18 Dec 2014 19:44:44 -0700
Subject: [PATCH 39/57] [courier/looper] track loop completion and rejected
 promises

---
 .../components/courier/looper/_looper.js      | 59 ++++++++-----------
 .../components/courier/looper/search.js       | 17 +++---
 2 files changed, 30 insertions(+), 46 deletions(-)

diff --git a/src/kibana/components/courier/looper/_looper.js b/src/kibana/components/courier/looper/_looper.js
index 60a4d3151c49..a64998cea3f9 100644
--- a/src/kibana/components/courier/looper/_looper.js
+++ b/src/kibana/components/courier/looper/_looper.js
@@ -1,13 +1,13 @@
 define(function (require) {
-  return function LooperFactory($timeout, Notifier) {
+  return function LooperFactory($timeout, Notifier, Promise) {
     var _ = require('lodash');
     var notify = new Notifier();
 
     function Looper(ms, fn) {
       var _ms = ms === void 0 ? 1500 : ms;
-      var _fns = [fn || _.noop];
       var _timerId;
       var _started = false;
+      var _loopPromise = true;
       var looper = this;
 
       /**
@@ -38,31 +38,6 @@ define(function (require) {
         return this;
       };
 
-      /**
-       * Set the function that will be executed at the
-       * end of each looper.
-       *
-       * @param  {function} fn
-       * @chainable
-       */
-      looper.add = function (fn) {
-        _fns.push(fn);
-        return this;
-      };
-
-      /**
-       * Set the function that will be executed at the
-       * end of each looper.
-       *
-       * @param  {function} fn
-       * @chainable
-       */
-      looper.remove = function (fn) {
-        var i = _fns.indexOf(fn);
-        if (i > -1) _fns.splice(i, 1);
-        return this;
-      };
-
       /**
        * Start the looping madness
        *
@@ -121,6 +96,16 @@ define(function (require) {
         return _ms;
       };
 
+      /**
+       * Called when the loop is executed before the previous
+       * run has completed.
+       *
+       * @return {undefined}
+       */
+      looper.onHastyLoop = function () {
+        console.log('hasty loop', looper);
+      };
+
       /**
        * Wraps _fn so that _fn can be changed
        * without rescheduling and schedules
@@ -130,18 +115,20 @@ define(function (require) {
        * @return {undefined}
        */
       looper._looperOver = function () {
-        try {
-          _.callEach(_fns);
-        } catch (e) {
-          looper.stop();
-          if (typeof console === 'undefined' || !console.error) {
-            throw e;
-          } else {
-            console.error(e.stack || e.message || e);
-          }
+        if (_loopPromise) {
+          looper.onHastyLoop();
         }
 
         _timerId = _ms ? $timeout(looper._looperOver, _ms) : null;
+        _loopPromise = Promise
+        .try(fn)
+        .catch(function (err) {
+          looper.stop();
+          notify.fatal(err);
+        })
+        .finally(function () {
+          _loopPromise = true;
+        });
       };
 
       /**
diff --git a/src/kibana/components/courier/looper/search.js b/src/kibana/components/courier/looper/search.js
index 96683a1e307c..2f2cc330ac7e 100644
--- a/src/kibana/components/courier/looper/search.js
+++ b/src/kibana/components/courier/looper/search.js
@@ -14,17 +14,14 @@ define(function (require) {
      * @type {Looper}
      */
     var searchLooper = new Looper(null, function () {
-      // fatal if refreshes take longer then the refresh interval
-      if (_activeAutoSearch) {
-        notif.warning('Skipping search attempt because previous search request has not completed');
-        return;
-      }
+      return Promise.all([fetch.searches(), fetch.segmentedSearches()]);
+    });
 
-      return _activeAutoSearch = Promise.all([fetch.searches(), fetch.segmentedSearches()])
-      .finally(function (res) {
-        _activeAutoSearch = null;
-      });
-    }).start();
+    searchLooper.onHastyLoop = function () {
+      notif.warning('Skipping search attempt because previous search request has not completed');
+    };
+
+    searchLooper.start();
 
     return searchLooper;
   };

From bea6d12604db679c4d853e35a966cb1ab5c18b0e Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Thu, 18 Dec 2014 19:49:25 -0700
Subject: [PATCH 40/57] [courier] shorter request class names +1

---
 .../components/courier/_request_queue.js      |  8 ++--
 .../courier/fetch/request/request.js          | 26 ++++++-------
 .../courier/fetch/request/search.js           | 16 ++++----
 .../courier/fetch/request/segmented.js        | 38 +++++++++----------
 src/kibana/components/courier/looper/doc.js   |  4 +-
 5 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/src/kibana/components/courier/_request_queue.js b/src/kibana/components/courier/_request_queue.js
index 910343b8c10b..dc99baff7fff 100644
--- a/src/kibana/components/courier/_request_queue.js
+++ b/src/kibana/components/courier/_request_queue.js
@@ -9,10 +9,8 @@ define(function (require) {
      */
     var queue = window.requestQueue = [];
 
-    function getQualified(strategies, started, qualify) {
+    function getQualified(strategies, qualify) {
       return queue.filter(function (req) {
-        if (req.started !== started) return false;
-
         var strategyMatch = !strategies.length;
         if (!strategyMatch) {
           strategyMatch = strategies.some(function (strategy) {
@@ -25,14 +23,14 @@ define(function (require) {
     }
 
     queue.getPending = function (/* strategies.. */) {
-      return getQualified(_.toArray(arguments), false, function (req) {
+      return getQualified(_.toArray(arguments), function (req) {
         return req.isReady();
       });
     };
 
 
     queue.getIncomplete = function (/* strategies.. */) {
-      return getQualified(_.toArray(arguments), false, function (req) {
+      return getQualified(_.toArray(arguments), function (req) {
         return req.isIncomplete();
       });
     };
diff --git a/src/kibana/components/courier/fetch/request/request.js b/src/kibana/components/courier/fetch/request/request.js
index 9e29437f59d6..ae6545889e4c 100644
--- a/src/kibana/components/courier/fetch/request/request.js
+++ b/src/kibana/components/courier/fetch/request/request.js
@@ -1,13 +1,13 @@
 define(function (require) {
-  return function GenericRequestProvider(Private, Promise) {
+  return function AbstractReqProvider(Private, Promise) {
     var _ = require('lodash');
     var moment = require('moment');
     var errors = require('errors');
     var requestErrorHandler = Private(require('components/courier/fetch/request/_error_handler'));
 
-    function GenericRequest(source, defer) {
-      if (!(this instanceof GenericRequest) || !this.constructor || this.constructor === GenericRequest) {
-        throw new Error('The GenericRequest class should not be called directly');
+    function AbstractReq(source, defer) {
+      if (!(this instanceof AbstractReq) || !this.constructor || this.constructor === AbstractReq) {
+        throw new Error('The AbstractReq class should not be called directly');
       }
 
       this.source = source;
@@ -16,17 +16,17 @@ define(function (require) {
     }
 
 
-    GenericRequest.prototype.isReady = function () {
+    AbstractReq.prototype.isReady = function () {
       return !this.source._fetchDisabled;
     };
 
 
-    GenericRequest.prototype.isIncomplete = function () {
+    AbstractReq.prototype.isIncomplete = function () {
       return false;
     };
 
 
-    GenericRequest.prototype.start = function () {
+    AbstractReq.prototype.start = function () {
       if (this.started) {
         throw new TypeError('Unable to start request because it has already started');
       }
@@ -48,7 +48,7 @@ define(function (require) {
     };
 
 
-    GenericRequest.prototype.stop = function () {
+    AbstractReq.prototype.stop = function () {
       if (this.complete) {
         throw new TypeError('Unable to stop request because it has already stopped');
       }
@@ -59,7 +59,7 @@ define(function (require) {
     };
 
 
-    GenericRequest.prototype.resolve = function (resp) {
+    AbstractReq.prototype.resolve = function (resp) {
       this.stop();
       this.success = true;
       this.resp = resp;
@@ -67,7 +67,7 @@ define(function (require) {
     };
 
 
-    GenericRequest.prototype.reject = function (resp) {
+    AbstractReq.prototype.reject = function (resp) {
       this.stop();
       this.success = false;
       this.resp = resp;
@@ -75,17 +75,17 @@ define(function (require) {
     };
 
 
-    GenericRequest.prototype.clone = function () {
+    AbstractReq.prototype.clone = function () {
       return new this.constructor(this.source, this.defer);
     };
 
 
-    GenericRequest.prototype.cancel = function () {
+    AbstractReq.prototype.cancel = function () {
       this.defer = null;
       this.started = false;
       this.canceled = true;
     };
 
-    return GenericRequest;
+    return AbstractReq;
   };
 });
\ No newline at end of file
diff --git a/src/kibana/components/courier/fetch/request/search.js b/src/kibana/components/courier/fetch/request/search.js
index f0e807460a5c..b255fb25f3b7 100644
--- a/src/kibana/components/courier/fetch/request/search.js
+++ b/src/kibana/components/courier/fetch/request/search.js
@@ -1,20 +1,20 @@
 define(function (require) {
-  return function SearchRequestProvider(Private) {
+  return function SearchReqProvider(Private) {
     var _ = require('lodash');
 
     var strategy = Private(require('components/courier/fetch/strategy/search'));
     var AbstractRequest = Private(require('components/courier/fetch/request/request'));
 
-    _(SearchRequest).inherits(AbstractRequest);
-    var Super = SearchRequest.Super;
-    function SearchRequest(source, defer) {
+    _(SearchReq).inherits(AbstractRequest);
+    var Super = SearchReq.Super;
+    function SearchReq(source, defer) {
       Super.call(this, source, defer);
     }
 
-    SearchRequest.prototype.type = 'search';
-    SearchRequest.prototype.strategy = strategy;
+    SearchReq.prototype.type = 'search';
+    SearchReq.prototype.strategy = strategy;
 
-    SearchRequest.prototype.resolve = function (resp) {
+    SearchReq.prototype.resolve = function (resp) {
       if (resp && resp.hits) {
         resp.hits.hits.forEach(function (hit) {
           hit._source = _.flattenWith('.', hit._source);
@@ -24,6 +24,6 @@ define(function (require) {
       return Super.prototype.resolve.call(this, resp);
     };
 
-    return SearchRequest;
+    return SearchReq;
   };
 });
\ No newline at end of file
diff --git a/src/kibana/components/courier/fetch/request/segmented.js b/src/kibana/components/courier/fetch/request/segmented.js
index ce18d0f44735..f728e47c1cf1 100644
--- a/src/kibana/components/courier/fetch/request/segmented.js
+++ b/src/kibana/components/courier/fetch/request/segmented.js
@@ -1,26 +1,26 @@
 define(function (require) {
-  return function SegmentedRequestProvider(Private) {
+  return function SegmentedReqProvider(Private) {
     var _ = require('lodash');
 
     var strategy = Private(require('components/courier/fetch/strategy/segmented'));
-    var SearchRequest = Private(require('components/courier/fetch/request/search'));
-    var SegmentedRequestState = Private(require('components/courier/fetch/segmented_state'));
+    var SearchReq = Private(require('components/courier/fetch/request/search'));
+    var SegmentedReqState = Private(require('components/courier/fetch/segmented_state'));
     var requestQueue = Private(require('components/courier/_request_queue'));
 
-    _(SegmentedRequest).inherits(SearchRequest);
-    function SegmentedRequest(source, defer, initFn) {
-      SegmentedRequest.Super.call(this, source, defer);
+    _(SegmentedReq).inherits(SearchReq);
+    function SegmentedReq(source, defer, initFn) {
+      SegmentedReq.Super.call(this, source, defer);
       this.initFn = initFn;
     }
 
-    SegmentedRequest.prototype.start = function () {
+    SegmentedReq.prototype.start = function () {
       if (!this.segState) {
-        this.segState = new SegmentedRequestState(this.source, this.initFn);
+        this.segState = new SegmentedReqState(this.source, this.initFn);
 
         // generate requests for all upcomming segments and push into the request queue
         _.range(this.segState.all.length - 1)
         .reduce(function (prev) {
-          var next = prev.next = prev.getNext();
+          var next = prev.next = prev.makeNext();
           next.prev = prev;
           next.segState = prev.segState;
           requestQueue.push(next);
@@ -28,32 +28,32 @@ define(function (require) {
         }, this);
       }
 
-      return SegmentedRequest.Super.prototype.start.call(this);
+      return SegmentedReq.Super.prototype.start.call(this);
     };
 
-    SegmentedRequest.prototype.type = 'segmented';
+    SegmentedReq.prototype.type = 'segmented';
 
 
-    SegmentedRequest.prototype.clone = function () {
-      return new SegmentedRequest(this.source, this.defer, this.initFn);
+    SegmentedReq.prototype.clone = function () {
+      return new SegmentedReq(this.source, this.defer, this.initFn);
     };
 
-    SegmentedRequest.prototype.getNext = SegmentedRequest.Super.prototype.clone;
+    SegmentedReq.prototype.makeNext = SegmentedReq.Super.prototype.clone;
 
 
-    SegmentedRequest.prototype.strategy = strategy;
+    SegmentedReq.prototype.strategy = strategy;
 
 
-    SegmentedRequest.prototype.isReady = function () {
-      var parent = SegmentedRequest.Super.prototype.isReady.call(this);
+    SegmentedReq.prototype.isReady = function () {
+      var parent = SegmentedReq.Super.prototype.isReady.call(this);
       return parent && !this.prev;
     };
 
 
-    SegmentedRequest.prototype.isIncomplete = function () {
+    SegmentedReq.prototype.isIncomplete = function () {
       return this.prev && this.prev.complete === true;
     };
 
-    return SegmentedRequest;
+    return SegmentedReq;
   };
 });
\ No newline at end of file
diff --git a/src/kibana/components/courier/looper/doc.js b/src/kibana/components/courier/looper/doc.js
index 2498fc7fa283..7090fee4077a 100644
--- a/src/kibana/components/courier/looper/doc.js
+++ b/src/kibana/components/courier/looper/doc.js
@@ -7,7 +7,9 @@ define(function (require) {
      * The Looper which will manage the doc fetch interval
      * @type {Looper}
      */
-    var docLooper = new Looper(1500, fetch.docs).start();
+    var docLooper = new Looper(1500, function () {
+      fetch.docs();
+    }).start();
 
     return docLooper;
   };

From f5bfcfecf4e35b6978ad439a89461ab9c9106f92 Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Thu, 18 Dec 2014 21:24:05 -0700
Subject: [PATCH 41/57] [courier] restart in progress requests on fetch()

---
 .../courier/data_source/_abstract.js          | 30 +++++++--------
 .../courier/data_source/search_source.js      |  8 +---
 .../components/courier/fetch/_fetch_these.js  | 27 +++++++++++---
 .../fetch/_merge_duplicate_requests.js        |  2 +-
 .../courier/fetch/request/_error_handler.js   |  3 --
 .../courier/fetch/request/request.js          | 35 ++++++++++++------
 .../courier/fetch/request/segmented.js        | 37 ++++++++++++++++---
 .../components/courier/looper/_looper.js      |  8 ++--
 .../components/courier/looper/search.js       |  2 -
 .../courier/saved_object/saved_object.js      |  6 ++-
 10 files changed, 102 insertions(+), 56 deletions(-)

diff --git a/src/kibana/components/courier/data_source/_abstract.js b/src/kibana/components/courier/data_source/_abstract.js
index 8495666174eb..0c1ba99f4cc8 100644
--- a/src/kibana/components/courier/data_source/_abstract.js
+++ b/src/kibana/components/courier/data_source/_abstract.js
@@ -123,8 +123,7 @@ define(function (require) {
       var self = this;
 
       return new PromiseEmitter(function (resolve, reject, defer) {
-        var req = self._createRequest(defer);
-        requestQueue.push(req);
+        self._createRequest(defer);
       }, handler);
     };
 
@@ -155,20 +154,22 @@ define(function (require) {
     /**
      * Fetch just this source ASAP
      *
-     * ONLY USE IF YOU NEED THE RESULTS OTHERWISE USE .fetchPending()
-     * TO TRIGGER FETCHING ALL PENDING REQUESTS
+     * ONLY USE IF YOU WILL BE USING THE RESULTS
+     * provided by the returned promise, otherwise
+     * call #fetchPending()
      *
      * @async
      */
     SourceAbstract.prototype.fetch = function () {
       var self = this;
-      var req = _.first(self._myPending());
+      var req = _.first(self._myPendingReq());
+
       if (!req) {
         req = self._createRequest();
-        requestQueue.push(req);
       }
 
-      self.fetchPending();
+      courierFetch.these([req]);
+
       return req.defer.promise;
     };
 
@@ -177,18 +178,15 @@ define(function (require) {
      * @async
      */
     SourceAbstract.prototype.fetchPending = function () {
-      return courierFetch.these(this._myPending());
+      return courierFetch.these(this._myPendingReq());
     };
 
     /**
      * Cancel all pending requests for this dataSource
      * @return {undefined}
      */
-    SourceAbstract.prototype.cancelPending = function (includeStarted) {
-      _(this._myPending(includeStarted)).forEach(function (req) {
-        req.cancel();
-        _.pull(requestQueue, req);
-      });
+    SourceAbstract.prototype.cancelPendingReq = function () {
+      _.invoke(this._myPendingReq(), 'cancel');
     };
 
     /**
@@ -196,15 +194,15 @@ define(function (require) {
      * @return {undefined}
      */
     SourceAbstract.prototype.destroy = function () {
-      this.cancelPending(true);
+      this.cancelPendingReq();
     };
 
     /*****
      * PRIVATE API
      *****/
 
-    SourceAbstract.prototype._myPending = function (includeStarted) {
-      return _.where(requestQueue, { source: this, started: !!includeStarted });
+    SourceAbstract.prototype._myPendingReq = function (includeStarted) {
+      return _.where(requestQueue.getPending(), { source: this });
     };
 
     SourceAbstract.prototype._createRequest = function (defer) {
diff --git a/src/kibana/components/courier/data_source/search_source.js b/src/kibana/components/courier/data_source/search_source.js
index 0249f6df9279..7290b57d18b5 100644
--- a/src/kibana/components/courier/data_source/search_source.js
+++ b/src/kibana/components/courier/data_source/search_source.js
@@ -4,7 +4,6 @@ define(function (require) {
     var _ = require('lodash');
     var errors = require('errors');
     var SourceAbstract = Private(require('components/courier/data_source/_abstract'));
-    var requestQueue = Private(require('components/courier/_request_queue'));
     var SearchRequest = Private(require('components/courier/fetch/request/search'));
     var SegmentedRequest = Private(require('components/courier/fetch/request/segmented'));
 
@@ -131,14 +130,11 @@ define(function (require) {
     SearchSource.prototype.onBeginSegmentedFetch = function (initFunction) {
       var self = this;
       return Promise.try(function addRequest() {
-        var defer = Promise.defer();
-        var req = new SegmentedRequest(self, defer, initFunction);
-
-        requestQueue.push(req);
+        var req = new SegmentedRequest(self, Promise.defer(), initFunction);
 
         // return promises created by the completion handler so that
         // errors will bubble properly
-        return defer.promise.then(addRequest);
+        return req.defer.promise.then(addRequest);
       });
     };
 
diff --git a/src/kibana/components/courier/fetch/_fetch_these.js b/src/kibana/components/courier/fetch/_fetch_these.js
index dc5864d711d6..135ab68c6436 100644
--- a/src/kibana/components/courier/fetch/_fetch_these.js
+++ b/src/kibana/components/courier/fetch/_fetch_these.js
@@ -4,7 +4,6 @@ define(function (require) {
 
     var errors = require('errors');
     var Notifier = require('components/notify/_notifier');
-
     var requestQueue = Private(require('components/courier/_request_queue'));
     var forEachStrategy = Private(require('components/courier/fetch/_for_each_strategy'));
     var mergeDuplicateRequests = Private(require('components/courier/fetch/_merge_duplicate_requests'));
@@ -29,18 +28,36 @@ define(function (require) {
     }
 
     function reqComplete(req, resp) {
-      _.pull(requestQueue, req);
-
       if (resp.timed_out) {
         notify.warning(new errors.SearchTimeout());
       }
 
+      if (req.canceled) return;
       return req[resp.error ? 'reject' : 'resolve'](resp);
     }
 
+    function startAndRestart(requests) {
+      var started = [];
+
+      requests.forEach(function (req) {
+        if (req.canceled) {
+          return;
+        }
+
+        if (req.started) {
+          req = req.restart();
+        } else {
+          req.start();
+        }
+
+        started.push(req);
+      });
+
+      return started;
+    }
+
     function executeFetch(requests, strategy) {
-      _.invoke(requests, 'start');
-      var uniq = mergeDuplicateRequests(requests);
+      var uniq = mergeDuplicateRequests(startAndRestart(requests));
       var states;
       var responses;
 
diff --git a/src/kibana/components/courier/fetch/_merge_duplicate_requests.js b/src/kibana/components/courier/fetch/_merge_duplicate_requests.js
index 5502de23fd78..dcb425119206 100644
--- a/src/kibana/components/courier/fetch/_merge_duplicate_requests.js
+++ b/src/kibana/components/courier/fetch/_merge_duplicate_requests.js
@@ -4,7 +4,7 @@ define(function (require) {
     function mergeDuplicateRequests(requests) {
       // dedupe requests
       var index = {};
-      return requests.splice(0).filter(function (req) {
+      return requests.filter(function (req) {
         var iid = req.source._instanceid;
         if (!index[iid]) {
           // this request is unique so far
diff --git a/src/kibana/components/courier/fetch/request/_error_handler.js b/src/kibana/components/courier/fetch/request/_error_handler.js
index 53dfac32d580..8cb2b81a9b29 100644
--- a/src/kibana/components/courier/fetch/request/_error_handler.js
+++ b/src/kibana/components/courier/fetch/request/_error_handler.js
@@ -1,6 +1,5 @@
 define(function (require) {
   return function RequestErrorHandlerFactory(Private, Notifier) {
-    var requestQueue = Private(require('components/courier/_request_queue'));
     var errorHandlers = Private(require('components/courier/_error_handlers'));
 
     var notify = new Notifier({
@@ -8,8 +7,6 @@ define(function (require) {
     });
 
     function handleError(req, error) {
-      requestQueue.push(req);
-
       var handlerCount = 0;
       errorHandlers.splice(0).forEach(function (handler) {
         if (handler.source !== req.source) return errorHandlers.push(handler);
diff --git a/src/kibana/components/courier/fetch/request/request.js b/src/kibana/components/courier/fetch/request/request.js
index ae6545889e4c..ee8471e91b68 100644
--- a/src/kibana/components/courier/fetch/request/request.js
+++ b/src/kibana/components/courier/fetch/request/request.js
@@ -3,6 +3,7 @@ define(function (require) {
     var _ = require('lodash');
     var moment = require('moment');
     var errors = require('errors');
+    var requestQueue = Private(require('components/courier/_request_queue'));
     var requestErrorHandler = Private(require('components/courier/fetch/request/_error_handler'));
 
     function AbstractReq(source, defer) {
@@ -13,11 +14,13 @@ define(function (require) {
       this.source = source;
       this.defer = defer || Promise.defer();
       this.started = false;
+
+      requestQueue.push(this);
     }
 
 
     AbstractReq.prototype.isReady = function () {
-      return !this.source._fetchDisabled;
+      return !this.complete && !this.canceled && !this.source._fetchDisabled;
     };
 
 
@@ -41,9 +44,8 @@ define(function (require) {
         source.activeFetchCount = 1;
       }
 
-      var history = source.history;
-      if (history) {
-        history = _.first(history.concat(this), 20);
+      if (source.history) {
+        source.history = _.first(source.history.concat(this), 20);
       }
     };
 
@@ -53,12 +55,29 @@ define(function (require) {
         throw new TypeError('Unable to stop request because it has already stopped');
       }
 
+      _.pull(requestQueue, this);
+
       this.ms = this.moment.diff() * -1;
       this.complete = true;
       this.source.activeFetchCount -= 1;
     };
 
 
+    AbstractReq.prototype.cancel = function () {
+      this.defer = null;
+      this.canceled = true;
+      _.pull(requestQueue, this);
+    };
+
+
+    AbstractReq.prototype.restart = function () {
+      var clone = this.clone();
+      this.cancel();
+      clone.start();
+      return clone;
+    };
+
+
     AbstractReq.prototype.resolve = function (resp) {
       this.stop();
       this.success = true;
@@ -71,6 +90,7 @@ define(function (require) {
       this.stop();
       this.success = false;
       this.resp = resp;
+      this.clone();
       return requestErrorHandler(this, new errors.FetchFailure(this));
     };
 
@@ -79,13 +99,6 @@ define(function (require) {
       return new this.constructor(this.source, this.defer);
     };
 
-
-    AbstractReq.prototype.cancel = function () {
-      this.defer = null;
-      this.started = false;
-      this.canceled = true;
-    };
-
     return AbstractReq;
   };
 });
\ No newline at end of file
diff --git a/src/kibana/components/courier/fetch/request/segmented.js b/src/kibana/components/courier/fetch/request/segmented.js
index f728e47c1cf1..34efbeb7837e 100644
--- a/src/kibana/components/courier/fetch/request/segmented.js
+++ b/src/kibana/components/courier/fetch/request/segmented.js
@@ -20,10 +20,9 @@ define(function (require) {
         // generate requests for all upcomming segments and push into the request queue
         _.range(this.segState.all.length - 1)
         .reduce(function (prev) {
-          var next = prev.next = prev.makeNext();
+          var next = prev.next = prev.clone();
           next.prev = prev;
           next.segState = prev.segState;
-          requestQueue.push(next);
           return next;
         }, this);
       }
@@ -38,9 +37,6 @@ define(function (require) {
       return new SegmentedReq(this.source, this.defer, this.initFn);
     };
 
-    SegmentedReq.prototype.makeNext = SegmentedReq.Super.prototype.clone;
-
-
     SegmentedReq.prototype.strategy = strategy;
 
 
@@ -49,9 +45,38 @@ define(function (require) {
       return parent && !this.prev;
     };
 
+    SegmentedReq.prototype.stop = function (resp) {
+      SegmentedReq.Super.prototype.stop.call(this, resp);
+
+      if (!this.prev) {
+        // keep the first request "pending" until the last request is complete
+        this.isReady = _.constant(true);
+        requestQueue.push(this);
+      }
+
+      if (!this.next) {
+        // walk back and make sure all previous requests are removed from queue
+        var prev = { prev: this };
+        while (prev = prev.prev) {
+          _.pull(requestQueue, prev);
+        }
+      }
+    };
+
+    SegmentedReq.prototype.resolve = function (resp) {
+      SegmentedReq.Super.prototype.resolve(resp);
+    };
 
     SegmentedReq.prototype.isIncomplete = function () {
-      return this.prev && this.prev.complete === true;
+      return !this.complete && this.prev && this.prev.complete === true;
+    };
+
+    SegmentedReq.prototype.cancel = function () {
+      SegmentedReq.Super.prototype.cancel.call(this);
+      if (this.next) {
+        this.next.cancel();
+        _.pull(requestQueue, this.next);
+      }
     };
 
     return SegmentedReq;
diff --git a/src/kibana/components/courier/looper/_looper.js b/src/kibana/components/courier/looper/_looper.js
index a64998cea3f9..954bdde0e4f9 100644
--- a/src/kibana/components/courier/looper/_looper.js
+++ b/src/kibana/components/courier/looper/_looper.js
@@ -7,7 +7,6 @@ define(function (require) {
       var _ms = ms === void 0 ? 1500 : ms;
       var _timerId;
       var _started = false;
-      var _loopPromise = true;
       var looper = this;
 
       /**
@@ -115,19 +114,20 @@ define(function (require) {
        * @return {undefined}
        */
       looper._looperOver = function () {
-        if (_loopPromise) {
+        if (looper.active) {
           looper.onHastyLoop();
         }
 
         _timerId = _ms ? $timeout(looper._looperOver, _ms) : null;
-        _loopPromise = Promise
+
+        looper.active = Promise
         .try(fn)
         .catch(function (err) {
           looper.stop();
           notify.fatal(err);
         })
         .finally(function () {
-          _loopPromise = true;
+          looper.active = null;
         });
       };
 
diff --git a/src/kibana/components/courier/looper/search.js b/src/kibana/components/courier/looper/search.js
index 2f2cc330ac7e..8cf5d9c055e8 100644
--- a/src/kibana/components/courier/looper/search.js
+++ b/src/kibana/components/courier/looper/search.js
@@ -21,8 +21,6 @@ define(function (require) {
       notif.warning('Skipping search attempt because previous search request has not completed');
     };
 
-    searchLooper.start();
-
     return searchLooper;
   };
 });
\ No newline at end of file
diff --git a/src/kibana/components/courier/saved_object/saved_object.js b/src/kibana/components/courier/saved_object/saved_object.js
index e3de5d6fa717..ef3ade3fd84c 100644
--- a/src/kibana/components/courier/saved_object/saved_object.js
+++ b/src/kibana/components/courier/saved_object/saved_object.js
@@ -232,8 +232,10 @@ define(function (require) {
        * @return {undefined}
        */
       self.destroy = function () {
-        docSource.cancelPending();
-        if (self.searchSource) self.searchSource.cancelPending();
+        docSource.cancelPendingReq();
+        if (self.searchSource) {
+          self.searchSource.cancelPendingReq();
+        }
       };
 
       /**

From 59db25378f1e3ff33cb57183c4b32de119db4de6 Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Fri, 19 Dec 2014 10:00:48 -0700
Subject: [PATCH 42/57] [events] update tests to use callbacks

---
 test/unit/specs/factories/events.js | 57 +++++++++++++++++------------
 1 file changed, 33 insertions(+), 24 deletions(-)

diff --git a/test/unit/specs/factories/events.js b/test/unit/specs/factories/events.js
index 487ea27f0266..317078ab7376 100644
--- a/test/unit/specs/factories/events.js
+++ b/test/unit/specs/factories/events.js
@@ -4,7 +4,7 @@ define(function (require) {
   var sinon = require('test_utils/auto_release_sinon');
   require('services/private');
 
-  describe('Events', function () {
+  describe.only('Events', function () {
     require('test_utils/no_digest_promises').activateForSuite();
 
     var $rootScope;
@@ -23,26 +23,31 @@ define(function (require) {
       });
     });
 
-    it('should handle on events', function (done) {
+    it('should handle on events', function () {
       var obj = new Events();
-      obj.on('test', function (message) {
+      var prom = obj.on('test', function (message) {
         expect(message).to.equal('Hello World');
-        done();
       });
+
       obj.emit('test', 'Hello World');
+
+      return prom;
     });
 
-    it('should work with inherited objects', function (done) {
+    it('should work with inherited objects', function () {
       _(MyEventedObject).inherits(Events);
       function MyEventedObject() {
         MyEventedObject.Super.call(this);
       }
       var obj = new MyEventedObject();
-      obj.on('test', function (message) {
+
+      var prom = obj.on('test', function (message) {
         expect(message).to.equal('Hello World');
-        done();
       });
+
       obj.emit('test', 'Hello World');
+
+      return prom;
     });
 
     it('should clear events when off is called', function () {
@@ -54,7 +59,7 @@ define(function (require) {
       expect(obj._listeners).to.not.have.property('test');
     });
 
-    it('should clear a specific handler when off is called for an event', function (done) {
+    it('should clear a specific handler when off is called for an event', function () {
       var obj = new Events();
       var handler1 = sinon.stub();
       var handler2 = sinon.stub();
@@ -62,27 +67,29 @@ define(function (require) {
       obj.on('test', handler2);
       expect(obj._listeners).to.have.property('test');
       obj.off('test', handler1);
-      obj.emit('test', 'Hello World').then(function () {
+
+      return obj.emit('test', 'Hello World')
+      .then(function () {
         sinon.assert.calledOnce(handler2);
         sinon.assert.notCalled(handler1);
-        done();
       });
     });
 
-    it('should clear a all handlers when off is called for an event', function (done) {
+    it('should clear a all handlers when off is called for an event', function () {
       var obj = new Events();
       var handler1 = sinon.stub();
       obj.on('test', handler1);
       expect(obj._listeners).to.have.property('test');
       obj.off('test');
       expect(obj._listeners).to.not.have.property('test');
-      obj.emit('test', 'Hello World').then(function () {
+
+      return obj.emit('test', 'Hello World')
+      .then(function () {
         sinon.assert.notCalled(handler1);
-        done();
       });
     });
 
-    it('should handle mulitple identical emits in the same tick', function (done) {
+    it('should handle mulitple identical emits in the same tick', function () {
       var obj = new Events();
       var handler1 = sinon.stub();
 
@@ -93,16 +100,17 @@ define(function (require) {
         obj.emit('test', 'three')
       ];
 
-      Promise.all(emits).then(function () {
+      return Promise
+      .all(emits)
+      .then(function () {
         expect(handler1.callCount).to.be(emits.length);
         expect(handler1.getCall(0).calledWith('one')).to.be(true);
         expect(handler1.getCall(1).calledWith('two')).to.be(true);
         expect(handler1.getCall(2).calledWith('three')).to.be(true);
-        done();
       });
     });
 
-    it('should handle emits from the handler', function (done) {
+    it('should handle emits from the handler', function () {
       var obj = new Events();
       var secondEmit = Promise.defer();
       var handler1 = sinon.spy(function () {
@@ -114,16 +122,17 @@ define(function (require) {
 
       obj.on('test', handler1);
 
-      Promise.all([
+      return Promise
+      .all([
         obj.emit('test'),
         secondEmit.promise
-      ]).then(function () {
+      ])
+      .then(function () {
         expect(handler1.callCount).to.be(2);
-        done();
       });
     });
 
-    it('should only emit to handlers registered before emit is called', function (done) {
+    it('should only emit to handlers registered before emit is called', function () {
       var obj = new Events();
       var handler1 = sinon.stub();
       var handler2 = sinon.stub();
@@ -136,7 +145,7 @@ define(function (require) {
       ];
 
 
-      Promise.all(emits).then(function () {
+      return Promise.all(emits).then(function () {
         expect(handler1.callCount).to.be(emits.length);
 
         obj.on('test', handler2);
@@ -147,10 +156,10 @@ define(function (require) {
           obj.emit('test', 'six')
         ];
 
-        Promise.all(emits2).then(function () {
+        return Promise.all(emits2)
+        .then(function () {
           expect(handler1.callCount).to.be(emits.length + emits2.length);
           expect(handler2.callCount).to.be(emits2.length);
-          done();
         });
       });
     });

From 08f213653eca0be4a36f6fdacc4f73c030262254 Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Fri, 19 Dec 2014 10:09:09 -0700
Subject: [PATCH 43/57] [events] always emit in the same order that emit was
 called

---
 src/kibana/factories/events.js      | 47 ++++++++++++-----------------
 test/unit/specs/factories/events.js | 30 +++++++++++++++++-
 2 files changed, 48 insertions(+), 29 deletions(-)

diff --git a/src/kibana/factories/events.js b/src/kibana/factories/events.js
index c747a2ac953e..30a2cd544dd5 100644
--- a/src/kibana/factories/events.js
+++ b/src/kibana/factories/events.js
@@ -9,6 +9,7 @@ define(function (require) {
     function Events() {
       Events.Super.call(this);
       this._listeners = {};
+      this._emitChain = Promise.resolve();
     }
 
     /**
@@ -22,26 +23,20 @@ define(function (require) {
         this._listeners[name] = [];
       }
 
-      var listener = { handler: handler };
-
-      // capture the promise that is resolved when listener.defer is "fresh"/new
-      // and attach it to the listener
-      (function buildDefer(value) {
-
-        // we will execute the handler on each re-build, but not the initial build
-        var rebuilding = listener.defer != null;
+      var listener = {
+        handler: handler
+      };
+      this._listeners[name].push(listener);
 
+      (function rebuildDefer() {
         listener.defer = Promise.defer();
-        listener.deferResolved = false;
-        listener.newDeferPromise = listener.defer.promise.then(buildDefer);
+        listener.resolved = listener.defer.promise.then(function (value) {
+          rebuildDefer();
 
-        if (!rebuilding) return;
-
-        // we ignore the completion of handlers, just watch for unhandled errors
-        Promise.try(handler, [value]).catch(notify.fatal);
+          // we ignore the completion of handlers, just watch for unhandled errors
+          Promise.resolve(handler(value)).catch(notify.fatal);
+        });
       }());
-
-      this._listeners[name].push(listener);
     };
 
     /**
@@ -76,21 +71,17 @@ define(function (require) {
      * @returns {Promise}
      */
     Events.prototype.emit = function (name, value) {
-      if (!this._listeners[name]) {
-        return Promise.resolve();
+      var self = this;
+
+      if (!self._listeners[name]) {
+        return self._emitChain;
       }
 
-      return Promise.map(this._listeners[name], function resolveListener(listener) {
-        if (listener.deferResolved) {
-          // this listener has already been resolved by another call to events#emit()
-          // so we wait for listener.defer to be recreated and try again
-          return listener.newDeferPromise.then(function () {
-            return resolveListener(listener);
-          });
-        } else {
-          listener.deferResolved = true;
+      return Promise.map(self._listeners[name], function (listener) {
+        return self._emitChain = self._emitChain.then(function () {
           listener.defer.resolve(value);
-        }
+          return listener.resolved;
+        });
       });
     };
 
diff --git a/test/unit/specs/factories/events.js b/test/unit/specs/factories/events.js
index 317078ab7376..3ed79969ed88 100644
--- a/test/unit/specs/factories/events.js
+++ b/test/unit/specs/factories/events.js
@@ -163,5 +163,33 @@ define(function (require) {
         });
       });
     });
+
+    it('should always emit in the same order', function () {
+      var handler = sinon.stub();
+
+      var obj = new Events();
+      obj.on('block', _.partial(handler, 'block'));
+      obj.on('last', _.partial(handler, 'last'));
+
+      return Promise
+      .all([
+        obj.emit('block'),
+        obj.emit('block'),
+        obj.emit('block'),
+        obj.emit('block'),
+        obj.emit('block'),
+        obj.emit('block'),
+        obj.emit('block'),
+        obj.emit('block'),
+        obj.emit('block'),
+        obj.emit('last')
+      ])
+      .then(function () {
+        expect(handler.callCount).to.be(10);
+        handler.args.forEach(function (args, i) {
+          expect(args[0]).to.be(i < 9 ? 'block' : 'last');
+        });
+      });
+    });
   });
-});
+});
\ No newline at end of file

From 5875b3731894c5b9af555a9e9738b71262214355 Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Fri, 19 Dec 2014 10:09:53 -0700
Subject: [PATCH 44/57] [errors] default to no error for RequestFailure

---
 src/kibana/components/errors.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/kibana/components/errors.js b/src/kibana/components/errors.js
index 877b30efc813..089db3e50c1d 100644
--- a/src/kibana/components/errors.js
+++ b/src/kibana/components/errors.js
@@ -52,6 +52,8 @@ define(function (require) {
    * @param {Object} resp - optional HTTP response
    */
   errors.RequestFailure = function RequestFailure(err, resp) {
+    err = err || false;
+
     KbnError.call(this,
       'Request to Elasticsearch failed: ' + JSON.stringify(resp || err.message),
       errors.RequestFailure);

From 5a3e3a9cf0989dddc2632bf3c00cf9473531a176 Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Fri, 19 Dec 2014 12:07:49 -0700
Subject: [PATCH 45/57] [courier/requestQueue] simplify pending request logic

---
 .../components/courier/_request_queue.js       | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/src/kibana/components/courier/_request_queue.js b/src/kibana/components/courier/_request_queue.js
index dc99baff7fff..bd341e784695 100644
--- a/src/kibana/components/courier/_request_queue.js
+++ b/src/kibana/components/courier/_request_queue.js
@@ -9,7 +9,8 @@ define(function (require) {
      */
     var queue = window.requestQueue = [];
 
-    function getQualified(strategies, qualify) {
+    queue.getPending = function (/* strategies.. */) {
+      var strategies = _.toArray(arguments);
       return queue.filter(function (req) {
         var strategyMatch = !strategies.length;
         if (!strategyMatch) {
@@ -18,20 +19,7 @@ define(function (require) {
           });
         }
 
-        return strategyMatch && qualify(req);
-      });
-    }
-
-    queue.getPending = function (/* strategies.. */) {
-      return getQualified(_.toArray(arguments), function (req) {
-        return req.isReady();
-      });
-    };
-
-
-    queue.getIncomplete = function (/* strategies.. */) {
-      return getQualified(_.toArray(arguments), function (req) {
-        return req.isIncomplete();
+        return strategyMatch && req.canStart();
       });
     };
 

From 0260b26fdf6087547ae1c6ce87534a80a35427ec Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Fri, 19 Dec 2014 12:08:43 -0700
Subject: [PATCH 46/57] [courier] only call fetch, not both fetch and looper

---
 src/kibana/components/courier/courier.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/kibana/components/courier/courier.js b/src/kibana/components/courier/courier.js
index 1c6d9a502022..879f59791bfa 100644
--- a/src/kibana/components/courier/courier.js
+++ b/src/kibana/components/courier/courier.js
@@ -59,7 +59,6 @@ define(function (require) {
        * individual errors are routed to their respective requests.
        */
       self.fetch = function () {
-        searchLooper.start();
         return Promise.all([
           fetch.searches(),
           fetch.segmentedSearches()

From 288ffe0168e7d1a2a73adbf83b0682eb465b237c Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Fri, 19 Dec 2014 12:11:21 -0700
Subject: [PATCH 47/57] [courier/fetch] tease and simplify fetch, added
 restartable requests

---
 .../components/courier/fetch/_call_client.js  |  96 +++++++
 .../courier/fetch/_call_response_handlers.js  |  46 ++++
 .../courier/fetch/_continue_incomplete.js     |  27 ++
 .../components/courier/fetch/_fetch_these.js  | 123 +++------
 .../courier/fetch/_for_each_strategy.js       |   2 +-
 .../components/courier/fetch/_is_request.js   |   9 +
 .../fetch/_merge_duplicate_requests.js        |  20 +-
 .../components/courier/fetch/_notifier.js     |   7 +
 .../components/courier/fetch/_req_status.js   |   9 +
 src/kibana/components/courier/fetch/fetch.js  |   3 +-
 .../courier/fetch/request/_error_handler.js   |  17 +-
 .../fetch/request/_segmented_handle.js        |  30 +++
 .../components/courier/fetch/request/doc.js   |   8 +-
 .../courier/fetch/request/request.js          |  89 ++++---
 .../courier/fetch/request/search.js           |  12 +-
 .../courier/fetch/request/segmented.js        | 201 +++++++++++----
 .../courier/fetch/segmented_state.js          | 168 -------------
 .../components/courier/fetch/strategy/doc.js  |  24 +-
 .../courier/fetch/strategy/search.js          |  32 ++-
 .../courier/fetch/strategy/segmented.js       |  47 ----
 .../plugins/discover/controllers/discover.js  |   4 +-
 .../courier/fetch/_segmented_state.js         | 236 ------------------
 .../courier/fetch/strategy/_segmented.js      | 197 ---------------
 23 files changed, 525 insertions(+), 882 deletions(-)
 create mode 100644 src/kibana/components/courier/fetch/_call_client.js
 create mode 100644 src/kibana/components/courier/fetch/_call_response_handlers.js
 create mode 100644 src/kibana/components/courier/fetch/_continue_incomplete.js
 create mode 100644 src/kibana/components/courier/fetch/_is_request.js
 create mode 100644 src/kibana/components/courier/fetch/_notifier.js
 create mode 100644 src/kibana/components/courier/fetch/_req_status.js
 create mode 100644 src/kibana/components/courier/fetch/request/_segmented_handle.js
 delete mode 100644 src/kibana/components/courier/fetch/segmented_state.js
 delete mode 100644 src/kibana/components/courier/fetch/strategy/segmented.js
 delete mode 100644 test/unit/specs/components/courier/fetch/_segmented_state.js
 delete mode 100644 test/unit/specs/components/courier/fetch/strategy/_segmented.js

diff --git a/src/kibana/components/courier/fetch/_call_client.js b/src/kibana/components/courier/fetch/_call_client.js
new file mode 100644
index 000000000000..3503138bce6c
--- /dev/null
+++ b/src/kibana/components/courier/fetch/_call_client.js
@@ -0,0 +1,96 @@
+define(function (require) {
+  return function CourierFetchCallClient(Private, Promise, es, configFile, sessionId) {
+    var _ = require('lodash');
+
+    var isRequest = Private(require('components/courier/fetch/_is_request'));
+    var mergeDuplicateRequests = Private(require('components/courier/fetch/_merge_duplicate_requests'));
+
+    var ABORTED = Private(require('components/courier/fetch/_req_status')).ABORTED;
+    var DUPLICATE = Private(require('components/courier/fetch/_req_status')).DUPLICATE;
+    var INCOMPLETE = Private(require('components/courier/fetch/_req_status')).INCOMPLETE;
+
+    function callClient(strategy, requests) {
+      var statuses = mergeDuplicateRequests(requests);
+
+      var executable = statuses.filter(isRequest);
+      var execCount = executable.length;
+
+      var esPromise;
+      var defer = Promise.defer();
+
+      statuses.forEach(function (req, i) {
+        if (!isRequest(req)) return;
+        req.whenAborted(function () {
+          requestWasAborted(req, i).catch(defer.reject);
+        });
+      });
+
+      var requestWasAborted = Promise.method(function (req, i) {
+        if (statuses[i] === ABORTED) {
+          defer.reject(new Error('Request was aborted twice?'));
+        }
+
+        execCount -= 1;
+        if (execCount > 0) {
+          return;
+        }
+
+        if (esPromise) {
+          // cancel active request
+          esPromise.abort();
+        } else {
+          // prevent request creation
+          esPromise = false;
+        }
+
+        return respond();
+      });
+
+      var respond = function (responses) {
+        responses = responses || [];
+        return Promise.map(requests, function (req, i) {
+          switch (statuses[i]) {
+          case ABORTED:
+            return ABORTED;
+          case DUPLICATE:
+            return _.cloneDeep(req._uniq.resp);
+          default:
+            return responses[_.findIndex(executable, req)];
+          }
+        })
+        .then(defer.resolve, defer.reject);
+      };
+
+      Promise.resolve(strategy.convertReqsToBody(executable))
+      .then(function (body) {
+        if (esPromise != null) {
+          throw ABORTED;
+        }
+
+        return (esPromise = es[strategy.clientMethod]({
+          timeout: configFile.shard_timeout,
+          preference: sessionId,
+          body: body
+        }));
+      })
+      .then(function (clientResp) {
+        return strategy.getResponses(clientResp);
+      })
+      .then(respond)
+      .catch(function (err) {
+        if (err === ABORTED) respond();
+        else defer.reject(err);
+      });
+
+      return defer.promise.catch(function (err) {
+        requests.forEach(function (req, i) {
+          if (statuses[i] !== ABORTED) {
+            req.handleFailure(err);
+          }
+        });
+      });
+    }
+
+    return callClient;
+  };
+});
\ No newline at end of file
diff --git a/src/kibana/components/courier/fetch/_call_response_handlers.js b/src/kibana/components/courier/fetch/_call_response_handlers.js
new file mode 100644
index 000000000000..bf24d74b26ff
--- /dev/null
+++ b/src/kibana/components/courier/fetch/_call_response_handlers.js
@@ -0,0 +1,46 @@
+define(function (require) {
+  return function CourierFetchCallResponseHandlers(Private, Promise) {
+    var ABORTED = Private(require('components/courier/fetch/_req_status')).ABORTED;
+    var INCOMPLETE = Private(require('components/courier/fetch/_req_status')).INCOMPLETE;
+    var notify = Private(require('components/courier/fetch/_notifier'));
+
+    var SearchTimeout = require('errors').SearchTimeout;
+    var RequestFailure = require('errors').RequestFailure;
+
+    function callResponseHandlers(strategy, requests, responses) {
+      return Promise.map(requests, function (req, i) {
+        var resp = responses[i];
+
+        if (req === ABORTED || req.aborted) {
+          return ABORTED;
+        }
+
+        if (resp.timed_out) {
+          notify.warning(new SearchTimeout());
+        }
+
+        if (resp.error) {
+          return req.handleFailure(new RequestFailure(null, resp));
+        }
+
+        return Promise.try(function () {
+          return req.transformResponse(resp);
+        })
+        .then(function () {
+          resp = arguments[0];
+          return req.handleResponse(resp);
+        })
+        .then(function () {
+          if (req.isIncomplete()) {
+            return INCOMPLETE;
+          }
+
+          req.complete();
+          return resp;
+        });
+      });
+    }
+
+    return callResponseHandlers;
+  };
+});
\ No newline at end of file
diff --git a/src/kibana/components/courier/fetch/_continue_incomplete.js b/src/kibana/components/courier/fetch/_continue_incomplete.js
new file mode 100644
index 000000000000..49070040d36f
--- /dev/null
+++ b/src/kibana/components/courier/fetch/_continue_incomplete.js
@@ -0,0 +1,27 @@
+define(function (require) {
+  return function CourierFetchContinueIncompleteRequests(Private) {
+    var INCOMPLETE = Private(require('components/courier/fetch/_req_status')).INCOMPLETE;
+
+    function continueIncompleteRequests(strategy, requests, responses, fetchWithStrategy) {
+      var incomplete = [];
+
+      responses.forEach(function (resp, i) {
+        if (resp === INCOMPLETE) {
+          incomplete.push(requests[i]);
+        }
+      });
+
+      if (!incomplete.length) return responses;
+
+      return fetchWithStrategy(strategy, incomplete)
+      .then(function (completedResponses) {
+        return responses.map(function (prevResponse) {
+          if (prevResponse !== INCOMPLETE) return prevResponse;
+          return completedResponses.shift();
+        });
+      });
+    }
+
+    return continueIncompleteRequests;
+  };
+});
\ No newline at end of file
diff --git a/src/kibana/components/courier/fetch/_fetch_these.js b/src/kibana/components/courier/fetch/_fetch_these.js
index 135ab68c6436..7467b023ffa8 100644
--- a/src/kibana/components/courier/fetch/_fetch_these.js
+++ b/src/kibana/components/courier/fetch/_fetch_these.js
@@ -1,113 +1,66 @@
 define(function (require) {
   return function FetchTheseProvider(Private, Promise, es, sessionId, configFile) {
     var _ = require('lodash');
-
-    var errors = require('errors');
-    var Notifier = require('components/notify/_notifier');
-    var requestQueue = Private(require('components/courier/_request_queue'));
+    var notify = Private(require('components/courier/fetch/_notifier'));
     var forEachStrategy = Private(require('components/courier/fetch/_for_each_strategy'));
-    var mergeDuplicateRequests = Private(require('components/courier/fetch/_merge_duplicate_requests'));
 
-    var notify = new Notifier({
-      location: 'Courier Fetch'
-    });
+    // core tasks
+    var callClient = Private(require('components/courier/fetch/_call_client'));
+    var callResponseHandlers = Private(require('components/courier/fetch/_call_response_handlers'));
+    var continueIncomplete = Private(require('components/courier/fetch/_continue_incomplete'));
 
-    function fetchThese(requests) {
-      return forEachStrategy(requests, function fetchRequestsWithStrategy(requests, strategy) {
-        return executeFetch(requests, strategy)
-        .then(function checkForIncompleteRequests(result) {
-          var incomplete = requestQueue.getIncomplete(strategy);
-          if (incomplete.length) {
-            return fetchRequestsWithStrategy(incomplete, strategy);
-          }
+    var ABORTED = Private(require('components/courier/fetch/_req_status')).ABORTED;
+    var DUPLICATE = Private(require('components/courier/fetch/_req_status')).DUPLICATE;
+    var INCOMPLETE = Private(require('components/courier/fetch/_req_status')).INCOMPLETE;
 
-          return result;
-        });
+    function fetchThese(requests) {
+      return forEachStrategy(requests, function (strategy, requests) {
+        return fetchWithStrategy(strategy, requests.map(function (req) {
+          if (!req.started) return req;
+          return req.retry();
+        }));
       })
       .catch(notify.fatal);
     }
 
-    function reqComplete(req, resp) {
-      if (resp.timed_out) {
-        notify.warning(new errors.SearchTimeout());
-      }
+    function fetchWithStrategy(strategy, requests) {
 
-      if (req.canceled) return;
-      return req[resp.error ? 'reject' : 'resolve'](resp);
-    }
-
-    function startAndRestart(requests) {
-      var started = [];
-
-      requests.forEach(function (req) {
-        if (req.canceled) {
-          return;
+      requests = requests.map(function (req) {
+        if (req.aborted) {
+          return ABORTED;
         }
 
         if (req.started) {
-          req = req.restart();
+          req.continue();
         } else {
           req.start();
         }
 
-        started.push(req);
+        return req;
       });
 
-      return started;
-    }
-
-    function executeFetch(requests, strategy) {
-      var uniq = mergeDuplicateRequests(startAndRestart(requests));
-      var states;
-      var responses;
-
-      return Promise
-      .map(uniq, strategy.getSourceStateFromRequest)
-      .then(function (_states_) {
-        states = _states_;
-
-        // all requests must have been disabled
-        if (!states.length) return Promise.resolve(false);
-
-        return es[strategy.clientMethod]({
-          timeout: configFile.shard_timeout,
-          preference: sessionId,
-          body: strategy.convertStatesToBody(states)
-        });
+      return Promise.resolve()
+      .then(function () {
+        return callClient(strategy, requests);
       })
-      .then(strategy.getResponses)
-      .then(function (_responses_) {
-        responses = _responses_;
-
-        return Promise.all(responses.map(function (resp) {
-          var req = uniq.shift();
-          var state = states.shift();
-
-          if (!req._merged) {
-            req.state = state;
-            return reqComplete(req, resp);
-          } else {
-            return Promise.all(req._merged.map(function (mergedReq) {
-              mergedReq.state = state;
-              return reqComplete(mergedReq, _.cloneDeep(resp));
-            }));
-          }
-        }));
+      .then(function (responses) {
+        return callResponseHandlers(strategy, requests, responses);
       })
-      .then(function () {
-        return responses;
+      .then(function (responses) {
+        return continueIncomplete(strategy, requests, responses, fetchWithStrategy);
       })
-      .catch(function (err) {
-        function sendFailure(req) {
-          req.reject(err);
-        }
-
-        uniq.forEach(function (req) {
-          if (!req._merged) sendFailure(req);
-          else req._merged.forEach(sendFailure);
+      .then(function (responses) {
+        return responses.map(function (resp) {
+          switch (resp) {
+          case ABORTED:
+            return null;
+          case DUPLICATE:
+          case INCOMPLETE:
+            throw new Error('Failed to clear incomplete or duplicate request from responses.');
+          default:
+            return resp;
+          }
         });
-
-        throw err;
       });
     }
 
diff --git a/src/kibana/components/courier/fetch/_for_each_strategy.js b/src/kibana/components/courier/fetch/_for_each_strategy.js
index a3e22aeb0e52..15b037e580d3 100644
--- a/src/kibana/components/courier/fetch/_for_each_strategy.js
+++ b/src/kibana/components/courier/fetch/_for_each_strategy.js
@@ -14,7 +14,7 @@ define(function (require) {
       });
 
       return Promise.all(sets.map(function (set) {
-        return block(set[1], set[0]);
+        return block(set[0], set[1]);
       }));
     }
 
diff --git a/src/kibana/components/courier/fetch/_is_request.js b/src/kibana/components/courier/fetch/_is_request.js
new file mode 100644
index 000000000000..51d022e85686
--- /dev/null
+++ b/src/kibana/components/courier/fetch/_is_request.js
@@ -0,0 +1,9 @@
+define(function (require) {
+  return function CourierFetchIsRequestProvider(Private) {
+    var AbstractRequest = Private(require('components/courier/fetch/request/request'));
+
+    return function isRequest(obj) {
+      return obj instanceof AbstractRequest;
+    };
+  };
+});
\ No newline at end of file
diff --git a/src/kibana/components/courier/fetch/_merge_duplicate_requests.js b/src/kibana/components/courier/fetch/_merge_duplicate_requests.js
index dcb425119206..03127fd582fd 100644
--- a/src/kibana/components/courier/fetch/_merge_duplicate_requests.js
+++ b/src/kibana/components/courier/fetch/_merge_duplicate_requests.js
@@ -1,27 +1,25 @@
 define(function (require) {
-  return function FetchMergeDuplicateRequests() {
+  return function FetchMergeDuplicateRequests(Private) {
+    var isRequest = Private(require('components/courier/fetch/_is_request'));
+    var DUPLICATE = Private(require('components/courier/fetch/_req_status')).DUPLICATE;
 
     function mergeDuplicateRequests(requests) {
       // dedupe requests
       var index = {};
-      return requests.filter(function (req) {
+      return requests.map(function (req) {
+        if (!isRequest(req)) return req;
+
         var iid = req.source._instanceid;
         if (!index[iid]) {
           // this request is unique so far
           index[iid] = req;
           // keep the request
-          return true;
+          return req;
         }
 
         // the source was requested at least twice
-        var uniq = index[iid];
-        if (uniq._merged) {
-          // already setup the merged list
-          uniq._merged.push(req);
-        } else {
-          // put all requests into this array and itterate them on response
-          uniq._merged = [uniq, req];
-        }
+        req._uniq = index[iid];
+        return DUPLICATE;
       });
     }
 
diff --git a/src/kibana/components/courier/fetch/_notifier.js b/src/kibana/components/courier/fetch/_notifier.js
new file mode 100644
index 000000000000..3573bcf99ebd
--- /dev/null
+++ b/src/kibana/components/courier/fetch/_notifier.js
@@ -0,0 +1,7 @@
+define(function (require) {
+  return function CourierFetchNotifier(Notifier) {
+    return new Notifier({
+      location: 'Courier Fetch'
+    });
+  };
+});
\ No newline at end of file
diff --git a/src/kibana/components/courier/fetch/_req_status.js b/src/kibana/components/courier/fetch/_req_status.js
new file mode 100644
index 000000000000..4c04a2f4de85
--- /dev/null
+++ b/src/kibana/components/courier/fetch/_req_status.js
@@ -0,0 +1,9 @@
+define(function (require) {
+  return function CourierFetchRequestStatus() {
+    return {
+      ABORTED: {},
+      DUPLICATE: {},
+      INCOMPLETE: {}
+    };
+  };
+});
\ No newline at end of file
diff --git a/src/kibana/components/courier/fetch/fetch.js b/src/kibana/components/courier/fetch/fetch.js
index 3a1488d40b53..50a9458d8fc9 100644
--- a/src/kibana/components/courier/fetch/fetch.js
+++ b/src/kibana/components/courier/fetch/fetch.js
@@ -4,8 +4,7 @@ define(function (require) {
 
     var strategies = this.strategies = {
       doc: Private(require('components/courier/fetch/strategy/doc')),
-      search: Private(require('components/courier/fetch/strategy/search')),
-      segmented: Private(require('components/courier/fetch/strategy/segmented'))
+      search: Private(require('components/courier/fetch/strategy/search'))
     };
 
     var requestQueue = Private(require('components/courier/_request_queue'));
diff --git a/src/kibana/components/courier/fetch/request/_error_handler.js b/src/kibana/components/courier/fetch/request/_error_handler.js
index 8cb2b81a9b29..665f1f9172ef 100644
--- a/src/kibana/components/courier/fetch/request/_error_handler.js
+++ b/src/kibana/components/courier/fetch/request/_error_handler.js
@@ -1,21 +1,24 @@
 define(function (require) {
   return function RequestErrorHandlerFactory(Private, Notifier) {
-    var errorHandlers = Private(require('components/courier/_error_handlers'));
+    var errHandlers = Private(require('components/courier/_error_handlers'));
 
     var notify = new Notifier({
       location: 'Courier Fetch Error'
     });
 
     function handleError(req, error) {
-      var handlerCount = 0;
-      errorHandlers.splice(0).forEach(function (handler) {
-        if (handler.source !== req.source) return errorHandlers.push(handler);
-        handler.defer.resolve(error);
-        handlerCount++;
+      var myHandlers = [];
+
+      errHandlers.splice(0).forEach(function (handler) {
+        (handler.source !== req.source ? myHandlers : errHandlers).push(handler);
       });
 
-      if (!handlerCount) {
+      if (!myHandlers.length) {
         notify.fatal(new Error('unhandled error ' + (error.stack || error.message)));
+      } else {
+        myHandlers.forEach(function (handler) {
+          handler.defer.resolve(error);
+        });
       }
     }
 
diff --git a/src/kibana/components/courier/fetch/request/_segmented_handle.js b/src/kibana/components/courier/fetch/request/_segmented_handle.js
new file mode 100644
index 000000000000..518f0ee727b1
--- /dev/null
+++ b/src/kibana/components/courier/fetch/request/_segmented_handle.js
@@ -0,0 +1,30 @@
+define(function (require) {
+  return function CourierSegmentedReqHandle(Private) {
+    var _ = require('lodash');
+    var Events = Private(require('factories/events'));
+
+    _(SegmentedHandle).inherits(Events);
+    function SegmentedHandle(req) {
+      SegmentedHandle.Super.call(this);
+      this._req = req;
+    }
+
+    SegmentedHandle.prototype.setTotalSize = function (totalSize) {
+      var req = this._req;
+      totalSize = _.parseInt(totalSize);
+      return (req._totalSize = totalSize || false);
+    };
+
+    SegmentedHandle.prototype.setDirection = function (dir) {
+      switch (dir) {
+      case 'asc':
+      case 'desc':
+        return (this._req._direction = dir);
+      default:
+        throw new TypeError('unkown sort direction "' + dir + '"');
+      }
+    };
+
+    return SegmentedHandle;
+  };
+});
\ No newline at end of file
diff --git a/src/kibana/components/courier/fetch/request/doc.js b/src/kibana/components/courier/fetch/request/doc.js
index d5138d79ef49..29cb01df120f 100644
--- a/src/kibana/components/courier/fetch/request/doc.js
+++ b/src/kibana/components/courier/fetch/request/doc.js
@@ -13,8 +13,8 @@ define(function (require) {
     DocRequest.prototype.type = 'doc';
     DocRequest.prototype.strategy = strategy;
 
-    DocRequest.prototype.isReady = function () {
-      var parent = DocRequest.Super.prototype.isReady.call(this);
+    DocRequest.prototype.canStart = function () {
+      var parent = DocRequest.Super.prototype.canStart.call(this);
       if (!parent) return false;
 
       // _getStoredVersion updates the internal
@@ -31,14 +31,14 @@ define(function (require) {
       if (unknownVersion || versionMismatch || localVersionCleared) return true;
     };
 
-    DocRequest.prototype.resolve = function (resp) {
+    DocRequest.prototype.handleResponse = function (resp) {
       if (resp.found) {
         this.source._storeVersion(resp._version);
       } else {
         this.source._clearVersion();
       }
 
-      return DocRequest.Super.prototype.resolve.call(this, resp);
+      return DocRequest.Super.prototype.handleResponse.call(this, resp);
     };
 
     return DocRequest;
diff --git a/src/kibana/components/courier/fetch/request/request.js b/src/kibana/components/courier/fetch/request/request.js
index ee8471e91b68..215828837ee8 100644
--- a/src/kibana/components/courier/fetch/request/request.js
+++ b/src/kibana/components/courier/fetch/request/request.js
@@ -13,22 +13,14 @@ define(function (require) {
 
       this.source = source;
       this.defer = defer || Promise.defer();
-      this.started = false;
 
       requestQueue.push(this);
     }
 
-
-    AbstractReq.prototype.isReady = function () {
-      return !this.complete && !this.canceled && !this.source._fetchDisabled;
-    };
-
-
-    AbstractReq.prototype.isIncomplete = function () {
-      return false;
+    AbstractReq.prototype.canStart = function () {
+      return !this.stopped && !this.aborted && !this.source._fetchDisabled;
     };
 
-
     AbstractReq.prototype.start = function () {
       if (this.started) {
         throw new TypeError('Unable to start request because it has already started');
@@ -49,51 +41,70 @@ define(function (require) {
       }
     };
 
+    AbstractReq.prototype.getFetchParams = function () {
+      return this.source._flatten();
+    };
 
-    AbstractReq.prototype.stop = function () {
-      if (this.complete) {
-        throw new TypeError('Unable to stop request because it has already stopped');
-      }
-
-      _.pull(requestQueue, this);
+    AbstractReq.prototype.transformResponse = function (resp) {
+      return resp;
+    };
 
-      this.ms = this.moment.diff() * -1;
-      this.complete = true;
-      this.source.activeFetchCount -= 1;
+    AbstractReq.prototype.handleResponse = function (resp) {
+      this.success = true;
+      this.resp = resp;
     };
 
+    AbstractReq.prototype.handleFailure = function (error) {
+      this.success = false;
+      this.resp = error && error.resp;
+      this.retry();
+      return requestErrorHandler(this, error);
+    };
 
-    AbstractReq.prototype.cancel = function () {
-      this.defer = null;
-      this.canceled = true;
-      _.pull(requestQueue, this);
+    AbstractReq.prototype.isIncomplete = function () {
+      return false;
     };
 
+    AbstractReq.prototype.continue = function () {
+      throw new Error('Unable to continue ' + this.type + ' request');
+    };
 
-    AbstractReq.prototype.restart = function () {
+    AbstractReq.prototype.retry = function () {
       var clone = this.clone();
-      this.cancel();
-      clone.start();
+      this.abort();
       return clone;
     };
 
+    // don't want people overriding this, so it becomes a natural
+    // part of .abort() and .complete()
+    function stop(then) {
+      return function () {
+        if (this.stopped) {
+          throw new TypeError('Unable to stop request because it has already stopped');
+        }
+
+        this.stopped = true;
+        this.source.activeFetchCount -= 1;
+        _.pull(requestQueue, this);
+        then.call(this);
+      };
+    }
 
-    AbstractReq.prototype.resolve = function (resp) {
-      this.stop();
-      this.success = true;
-      this.resp = resp;
-      return this.defer.resolve(resp);
-    };
-
+    AbstractReq.prototype.abort = stop(function () {
+      this.defer = null;
+      this.aborted = true;
+      if (this._whenAborted) _.callEach(this._whenAborted);
+    });
 
-    AbstractReq.prototype.reject = function (resp) {
-      this.stop();
-      this.success = false;
-      this.resp = resp;
-      this.clone();
-      return requestErrorHandler(this, new errors.FetchFailure(this));
+    AbstractReq.prototype.whenAborted = function (cb) {
+      this._whenAborted = (this._whenAborted || []);
+      this._whenAborted.push(cb);
     };
 
+    AbstractReq.prototype.complete = stop(function () {
+      this.ms = this.moment.diff() * -1;
+      this.defer.resolve(this.resp);
+    });
 
     AbstractReq.prototype.clone = function () {
       return new this.constructor(this.source, this.defer);
diff --git a/src/kibana/components/courier/fetch/request/search.js b/src/kibana/components/courier/fetch/request/search.js
index b255fb25f3b7..a03d6d4d4315 100644
--- a/src/kibana/components/courier/fetch/request/search.js
+++ b/src/kibana/components/courier/fetch/request/search.js
@@ -2,26 +2,26 @@ define(function (require) {
   return function SearchReqProvider(Private) {
     var _ = require('lodash');
 
-    var strategy = Private(require('components/courier/fetch/strategy/search'));
+    var searchStrategy = Private(require('components/courier/fetch/strategy/search'));
     var AbstractRequest = Private(require('components/courier/fetch/request/request'));
 
     _(SearchReq).inherits(AbstractRequest);
     var Super = SearchReq.Super;
     function SearchReq(source, defer) {
       Super.call(this, source, defer);
-    }
 
-    SearchReq.prototype.type = 'search';
-    SearchReq.prototype.strategy = strategy;
+      this.type = 'search';
+      this.strategy = searchStrategy;
+    }
 
-    SearchReq.prototype.resolve = function (resp) {
+    SearchReq.prototype.transformResponse = function (resp) {
       if (resp && resp.hits) {
         resp.hits.hits.forEach(function (hit) {
           hit._source = _.flattenWith('.', hit._source);
         });
       }
 
-      return Super.prototype.resolve.call(this, resp);
+      return resp;
     };
 
     return SearchReq;
diff --git a/src/kibana/components/courier/fetch/request/segmented.js b/src/kibana/components/courier/fetch/request/segmented.js
index 34efbeb7837e..264d3d1d9945 100644
--- a/src/kibana/components/courier/fetch/request/segmented.js
+++ b/src/kibana/components/courier/fetch/request/segmented.js
@@ -1,84 +1,185 @@
 define(function (require) {
-  return function SegmentedReqProvider(Private) {
+  return function CourierSegmentedReqProvider(es, Private, Promise, Notifier, timefilter) {
     var _ = require('lodash');
-
-    var strategy = Private(require('components/courier/fetch/strategy/segmented'));
     var SearchReq = Private(require('components/courier/fetch/request/search'));
-    var SegmentedReqState = Private(require('components/courier/fetch/segmented_state'));
     var requestQueue = Private(require('components/courier/_request_queue'));
+    var SegmentedHandle = Private(require('components/courier/fetch/request/_segmented_handle'));
+
+    var notify = new Notifier({
+      location: 'Segmented Fetch'
+    });
 
     _(SegmentedReq).inherits(SearchReq);
     function SegmentedReq(source, defer, initFn) {
-      SegmentedReq.Super.call(this, source, defer);
-      this.initFn = initFn;
+      SearchReq.call(this, source, defer);
+
+      this.type = 'segmented';
+
+      // segmented request specific state
+      this._initFn = initFn;
+      this._totalSize = false;
+      this._direction = 'desc';
+      this._handle = new SegmentedHandle(this);
+
+      // give the request consumer a chance to receive each segment and set
+      // parameters via the handle
+      if (_.isFunction(initFn)) initFn(this._handle);
+
+      this._remainingSize = this._totalSize !== false ? this._totalSize : false;
+      this._createQueue();
+      this._all = this._queue.slice(0);
+      this._complete = [];
+      this._active = null;
+      this._segments = [];
+
+      this._mergedResp = {
+        took: 0,
+        hits: {
+          hits: [],
+          total: 0,
+          max_score: 0
+        }
+      };
+
+      // prevent the source from changing between requests
+      this._flattenSource = _.once(function () { return this.source._flatten(); });
+
+      // send out the initial status
+      this._reportStatus();
     }
 
+    /*********
+     ** SearchReq overrides
+     *********/
+
     SegmentedReq.prototype.start = function () {
-      if (!this.segState) {
-        this.segState = new SegmentedReqState(this.source, this.initFn);
-
-        // generate requests for all upcomming segments and push into the request queue
-        _.range(this.segState.all.length - 1)
-        .reduce(function (prev) {
-          var next = prev.next = prev.clone();
-          next.prev = prev;
-          next.segState = prev.segState;
-          return next;
-        }, this);
-      }
+      // update the status on every iteration
+      this._reportStatus();
+      return SearchReq.prototype.start.call(this);
+    };
 
-      return SegmentedReq.Super.prototype.start.call(this);
+    SegmentedReq.prototype.continue = function () {
+      return this._reportStatus();
     };
 
-    SegmentedReq.prototype.type = 'segmented';
+    SegmentedReq.prototype.getFetchParams = function () {
+      var self = this;
 
+      return self._flattenSource()
+      .then(function (flatSource) {
+        var params = _.cloneDeep(flatSource);
+        var index = self._active = self._queue.shift();
 
-    SegmentedReq.prototype.clone = function () {
-      return new SegmentedReq(this.source, this.defer, this.initFn);
-    };
+        params.index = index;
 
-    SegmentedReq.prototype.strategy = strategy;
+        if (self._remainingSize !== false) {
+          params.body.size = self._remainingSize;
+        }
 
+        return params;
+      });
+    };
 
-    SegmentedReq.prototype.isReady = function () {
-      var parent = SegmentedReq.Super.prototype.isReady.call(this);
-      return parent && !this.prev;
+    SegmentedReq.prototype.handleResponse = function (resp) {
+      return this._consumeSegment(resp);
     };
 
-    SegmentedReq.prototype.stop = function (resp) {
-      SegmentedReq.Super.prototype.stop.call(this, resp);
+    SegmentedReq.prototype.isIncomplete = function () {
+      return this._queue.length > 0;
+    };
 
-      if (!this.prev) {
-        // keep the first request "pending" until the last request is complete
-        this.isReady = _.constant(true);
-        requestQueue.push(this);
-      }
+    SegmentedReq.prototype.clone = function () {
+      return new SegmentedReq(this.source, this.defer, this._initFn);
+    };
 
-      if (!this.next) {
-        // walk back and make sure all previous requests are removed from queue
-        var prev = { prev: this };
-        while (prev = prev.prev) {
-          _.pull(requestQueue, prev);
-        }
-      }
+    SegmentedReq.prototype.complete = function () {
+      return SearchReq.prototype.complete.call(this);
     };
 
-    SegmentedReq.prototype.resolve = function (resp) {
-      SegmentedReq.Super.prototype.resolve(resp);
+
+    /*********
+     ** SegmentedReq specific methods
+     *********/
+
+    SegmentedReq.prototype._createQueue = function () {
+      var timeBounds = timefilter.getBounds();
+      var indexPattern = this.source.get('index');
+      var queue = indexPattern.toIndexList(timeBounds.min, timeBounds.max);
+
+      if (!_.isArray(queue)) queue = [queue];
+      if (this._direction === 'desc') queue = queue.reverse();
+
+      return (this._queue = queue);
     };
 
-    SegmentedReq.prototype.isIncomplete = function () {
-      return !this.complete && this.prev && this.prev.complete === true;
+    SegmentedReq.prototype._reportStatus = function (active) {
+      return this._handle.emit('status', {
+        total: this._all.length,
+        complete: this._complete.length,
+        remaining: this._queue.length,
+        active: this._active
+      });
     };
 
-    SegmentedReq.prototype.cancel = function () {
-      SegmentedReq.Super.prototype.cancel.call(this);
-      if (this.next) {
-        this.next.cancel();
-        _.pull(requestQueue, this.next);
+    SegmentedReq.prototype._consumeSegment = function (seg) {
+      this._segments.push(seg);
+
+      var index = this._active;
+      var first = this._segments.length === 1;
+
+      this._complete.push(index);
+
+      if (this._remainingSize !== false) {
+        this._remainingSize -= seg.hits.hits.length;
+      }
+
+      if (seg) {
+        this._mergeSegment(seg);
+        this.resp = _.omit(this._mergedResp, '_bucketIndex');
+
+        if (first) this._handle.emit('first', seg);
+        this._handle.emit('segment', seg);
+        this._handle.emit('mergedSegment', this.resp);
       }
     };
 
+    SegmentedReq.prototype._mergeSegment = notify.timed('merge response segment', function (seg) {
+      var merged = this._mergedResp;
+
+      merged.took += seg.took;
+      merged.hits.total = Math.max(merged.hits.total, seg.hits.total);
+      merged.hits.max_score = Math.max(merged.hits.max_score, seg.hits.max_score);
+      [].push.apply(merged.hits.hits, seg.hits.hits);
+
+      if (!seg.aggregations) return;
+
+      Object.keys(seg.aggregations).forEach(function (aggKey) {
+
+        if (!merged.aggregations) {
+          // start merging aggregations
+          merged.aggregations = {};
+          merged._bucketIndex = {};
+        }
+
+        if (!merged.aggregations[aggKey]) {
+          merged.aggregations[aggKey] = {
+            buckets: []
+          };
+        }
+
+        seg.aggregations[aggKey].buckets.forEach(function (bucket) {
+          var mbucket = merged._bucketIndex[bucket.key];
+          if (mbucket) {
+            mbucket.doc_count += bucket.doc_count;
+            return;
+          }
+
+          mbucket = merged._bucketIndex[bucket.key] = bucket;
+          merged.aggregations[aggKey].buckets.push(mbucket);
+        });
+      });
+    });
+
     return SegmentedReq;
   };
 });
\ No newline at end of file
diff --git a/src/kibana/components/courier/fetch/segmented_state.js b/src/kibana/components/courier/fetch/segmented_state.js
deleted file mode 100644
index be8eb2b6e824..000000000000
--- a/src/kibana/components/courier/fetch/segmented_state.js
+++ /dev/null
@@ -1,168 +0,0 @@
-define(function (require) {
-  return function CourierSegmentedStateProvider(es, Private, Promise, Notifier, timefilter) {
-    var _ = require('lodash');
-    var Events = Private(require('factories/events'));
-
-    var notify = new Notifier({
-      location: 'Segmented Fetch'
-    });
-
-    _(SegmentedState).inherits(Events);
-    function SegmentedState(source, init) {
-      SegmentedState.Super.call(this);
-
-      this.source = source;
-      this.totalSize = false;
-      this.direction = 'desc';
-
-      if (_.isFunction(init)) {
-        init(this);
-      }
-
-      this.remainingSize = this.totalSize !== false ? this.totalSize : false;
-
-      this.all = this.getIndexList(this.source, this.direction);
-      this.queue = this.all.slice(0);
-      this.complete = [];
-
-      this.mergedResponse = {
-        took: 0,
-        hits: {
-          hits: [],
-          total: 0,
-          max_score: 0
-        }
-      };
-
-      this.emitChain = this.emit('status', this._statusReport(null));
-
-      this.getFlattenedSource = _.once(function () {
-        return this.source._flatten();
-      });
-    }
-
-    SegmentedState.prototype._statusReport = function (active) {
-      return {
-        total: this.all.length,
-        complete: this.complete.length,
-        remaining: this.queue.length,
-        active: active
-      };
-    };
-
-    SegmentedState.prototype.getSourceStateFromRequest = function (req) {
-      var self = this;
-      var emits = [];
-
-      return self.getFlattenedSource().then(function (flatSource) {
-        var first = self.queue.length === self.all.length;
-        var index = self.queue.shift();
-        var last = self.queue.length === 0;
-
-        // update the status on every iteration
-        self.emitChain = self.emitChain.then(function () {
-          emits.push(['status', self._statusReport(index)]);
-        });
-
-        var requestersDefer = req.defer;
-        var ourDefer = req.defer = Promise.defer();
-
-        ourDefer.promise
-        .then(function (resp) {
-          if (resp) self._consumeSegment(resp);
-
-          req.resp = _.omit(self.mergedResponse, '_bucketIndex');
-          self.complete.push(index);
-
-          if (resp) {
-            if (first) emits.push(['first', resp]);
-            emits.push(['segment', resp]);
-            emits.push(['mergedSegment', req.resp]);
-          }
-
-          self.emitChain = self.emitChain
-          .then(function nextEmit() {
-            var emit = emits.shift();
-            if (emit) {
-              return self.emit(emit[0], emit[1]).then(nextEmit);
-            }
-          });
-
-          if (last) {
-            emits.push(['complete']);
-            self.emitChain = self.emitChain.then(function () {
-              requestersDefer.resolve(req.resp);
-            });
-          }
-        });
-
-        var state = _.cloneDeep(flatSource);
-        state.index = index;
-        if (self.remainingSize !== false) {
-          state.body.size = self.remainingSize;
-        }
-
-        return state;
-      });
-    };
-
-
-    SegmentedState.prototype._consumeSegment = function (resp) {
-      if (this.remainingSize !== false) {
-        this.remainingSize -= resp.hits.hits.length;
-      }
-
-      this._mergeResponse(this.mergedResponse, resp);
-    };
-
-
-    SegmentedState.prototype.getIndexList = function () {
-      var self = this;
-      var timeBounds = timefilter.getBounds();
-      var list = self.source.get('index').toIndexList(timeBounds.min, timeBounds.max);
-
-      if (!_.isArray(list)) list = [list];
-      if (self.direction === 'desc') list = list.reverse();
-
-      return list;
-    };
-
-
-    SegmentedState.prototype._mergeResponse = notify.timed('merge response segment', function (merged, resp) {
-      merged.took += resp.took;
-      merged.hits.total = Math.max(merged.hits.total, resp.hits.total);
-      merged.hits.max_score = Math.max(merged.hits.max_score, resp.hits.max_score);
-      [].push.apply(merged.hits.hits, resp.hits.hits);
-
-      if (!resp.aggregations) return;
-
-      Object.keys(resp.aggregations).forEach(function (aggKey) {
-
-        if (!merged.aggregations) {
-          // start merging aggregations
-          merged.aggregations = {};
-          merged._bucketIndex = {};
-        }
-
-        if (!merged.aggregations[aggKey]) {
-          merged.aggregations[aggKey] = {
-            buckets: []
-          };
-        }
-
-        resp.aggregations[aggKey].buckets.forEach(function (bucket) {
-          var mbucket = merged._bucketIndex[bucket.key];
-          if (mbucket) {
-            mbucket.doc_count += bucket.doc_count;
-            return;
-          }
-
-          mbucket = merged._bucketIndex[bucket.key] = bucket;
-          merged.aggregations[aggKey].buckets.push(mbucket);
-        });
-      });
-    });
-
-    return SegmentedState;
-  };
-});
\ No newline at end of file
diff --git a/src/kibana/components/courier/fetch/strategy/doc.js b/src/kibana/components/courier/fetch/strategy/doc.js
index 339e9497f0e4..e222e6233238 100644
--- a/src/kibana/components/courier/fetch/strategy/doc.js
+++ b/src/kibana/components/courier/fetch/strategy/doc.js
@@ -1,26 +1,22 @@
 define(function (require) {
-  return function FetchStrategyForDoc() {
+  return function FetchStrategyForDoc(Promise) {
     return {
       clientMethod: 'mget',
 
-      /**
-       * Turn a request into a flat "state"
-       * @param  {[type]} req [description]
-       * @return {[type]}     [description]
-       */
-      getSourceStateFromRequest: function (req) {
-        return req.source._flatten();
-      },
-
       /**
        * Flatten a series of requests into as ES request body
        * @param  {array} requests - an array of flattened requests
        * @return {string} - the request body
        */
-      convertStatesToBody: function (states) {
-        return {
-          docs: states
-        };
+      convertReqsToBody: function (reqs) {
+        return Promise.map(reqs, function (req) {
+          return req.getFetchParams();
+        })
+        .then(function (reqsParams) {
+          return {
+            docs: reqsParams
+          };
+        });
       },
 
       /**
diff --git a/src/kibana/components/courier/fetch/strategy/search.js b/src/kibana/components/courier/fetch/strategy/search.js
index 82f08e8c06d6..0e7df87a138b 100644
--- a/src/kibana/components/courier/fetch/strategy/search.js
+++ b/src/kibana/components/courier/fetch/strategy/search.js
@@ -1,33 +1,39 @@
 define(function (require) {
-  return function FetchStrategyForSearch(Private, Promise, timefilter) {
+  return function FetchStrategyForSearch(Private, Promise, timefilter, configFile) {
     var _ = require('lodash');
 
     return {
       clientMethod: 'msearch',
 
-      getSourceStateFromRequest: function (req) {
-        return req.source._flatten();
-      },
-
       /**
        * Flatten a series of requests into as ES request body
+       *
        * @param  {array} requests - the requests to serialize
        * @return {string} - the request body
        */
-      convertStatesToBody: function (states) {
-        return states.map(function (state) {
-          var timeBounds = timefilter.getBounds();
-          var indexList = state.index.toIndexList(timeBounds.min, timeBounds.max);
+      convertReqsToBody: function (reqs) {
+        return Promise.map(reqs, function (req) {
+          return req.getFetchParams();
+        })
+        .then(function (reqsParams) {
+          return reqsParams.map(function (reqParams) {
+            var indexList = reqParams.index;
+
+            if (_.isFunction(_.deepGet(indexList, 'toIndexList'))) {
+              var timeBounds = timefilter.getBounds();
+              indexList = indexList.toIndexList(timeBounds.min, timeBounds.max);
+            }
 
-          return JSON.stringify({
+            return JSON.stringify({
               index: indexList,
-              type: state.type,
+              type: reqParams.type,
               ignore_unavailable: true
             })
             + '\n'
-            + JSON.stringify(state.body);
+            + JSON.stringify(reqParams.body || {});
 
-        }).join('\n') + '\n';
+          }).join('\n') + '\n';
+        });
       },
 
       /**
diff --git a/src/kibana/components/courier/fetch/strategy/segmented.js b/src/kibana/components/courier/fetch/strategy/segmented.js
deleted file mode 100644
index 799fdb6df205..000000000000
--- a/src/kibana/components/courier/fetch/strategy/segmented.js
+++ /dev/null
@@ -1,47 +0,0 @@
-define(function (require) {
-  return function FetchStrategyForSegmentedSearch(Private, Promise, Notifier, timefilter, es, configFile) {
-    var _ = require('lodash');
-    var searchStrategy = Private(require('components/courier/fetch/strategy/search'));
-
-    // extend the client to behave well for this strategy
-    es.segmentSafeMsearch = function (params) {
-      return es.msearch(params)
-      .catch(function (err) {
-        // swallow errors from closed indices
-        if (err.status === 403 && err.message.match(/ClusterBlockException.+index closed/)) {
-          return false;
-        } else {
-          throw err;
-        }
-      });
-    };
-
-    // extend the searchStrategy with simple pojo merging
-    return _.assign(Object.create(searchStrategy), {
-      clientMethod: 'segmentSafeMsearch',
-
-      getSourceStateFromRequest: function (req) {
-        return req.segState.getSourceStateFromRequest(req);
-      },
-
-      /**
-       * Flatten a series of requests into as ES request body
-       * @param  {array} requests - the requests to serialize
-       * @return {string} - the request body
-       */
-      convertStatesToBody: function (states) {
-        return states.map(function (state) {
-          return JSON.stringify({
-              index: state.index,
-              type: state.type,
-              ignore_unavailable: true,
-              timeout: configFile.shard_timeout
-            })
-            + '\n'
-            + JSON.stringify(state.body);
-
-        }).join('\n') + '\n';
-      }
-    });
-  };
-});
\ No newline at end of file
diff --git a/src/kibana/plugins/discover/controllers/discover.js b/src/kibana/plugins/discover/controllers/discover.js
index 99f13426ea7c..ff67bcfc7a2d 100644
--- a/src/kibana/plugins/discover/controllers/discover.js
+++ b/src/kibana/plugins/discover/controllers/discover.js
@@ -307,8 +307,8 @@ define(function (require) {
         sortFn = new HitSortFn(sort[1]);
       }
 
-      segmented.totalSize = sortBy === 'non-time' ? false : totalSize;
-      segmented.direction = sortBy === 'time' ? sort[1] : 'desc';
+      segmented.setTotalSize(sortBy === 'non-time' ? false : totalSize);
+      segmented.setDirection(sortBy === 'time' ? sort[1] : 'desc');
 
       // triggered when the status updated
       segmented.on('status', function (status) {
diff --git a/test/unit/specs/components/courier/fetch/_segmented_state.js b/test/unit/specs/components/courier/fetch/_segmented_state.js
deleted file mode 100644
index a168c3fbe67c..000000000000
--- a/test/unit/specs/components/courier/fetch/_segmented_state.js
+++ /dev/null
@@ -1,236 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var sinon = require('test_utils/auto_release_sinon');
-
-  var Promise;
-  var $rootScope;
-  var fakeSource;
-  var flatSource;
-  var indexPattern;
-  var SegmentedState;
-  var requestQueue;
-  var indices = [
-    'logstash-2014.12.14',
-    'logstash-2014.12.15',
-    'logstash-2014.12.16',
-    'logstash-2014.12.17',
-    'logstash-2014.12.18'
-  ];
-
-  return ['SegmentedState class', function () {
-    beforeEach(module('kibana'));
-    beforeEach(inject(function ($injector, Private) {
-      Promise = $injector.get('Promise');
-      $rootScope = $injector.get('$rootScope');
-      SegmentedState = Private(require('components/courier/fetch/segmented_state'));
-      requestQueue = Private(require('components/courier/_request_queue'));
-
-      flatSource = {
-        index: indices,
-        body: {
-          query: {
-            match_all: {}
-          }
-        }
-      };
-
-      indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-      indexPattern.toIndexList = _.constant(indices);
-
-      fakeSource = {
-        get: _.constant(indexPattern),
-        _flatten: _.constant(Promise.resolve(flatSource)),
-        _createRequest: function (requestersDefer) {
-          return {
-            source: this,
-            defer: requestersDefer
-          };
-        }
-      };
-    }));
-
-    describe('constructor', function () {
-      it('flattens the source object', function () {
-        var state = new SegmentedState(fakeSource);
-
-        var flat;
-        state.promiseForFlatSource.then(function (source) {
-          flat = source;
-        });
-        $rootScope.$apply();
-
-        expect(flat).to.be(flatSource);
-      });
-
-      it('calls the init argument', function () {
-        var init = sinon.stub();
-        var state = new SegmentedState(fakeSource, init);
-
-        expect(init).to.have.property('callCount', 1);
-        expect(init.getCall(0).args[0]).to.be(state);
-      });
-
-      it('handles non-function init arguments', function () {
-        var state = new SegmentedState(fakeSource, {});
-      });
-
-      it('sets up the index queue', function () {
-        var state = new SegmentedState(fakeSource);
-        state.direction = 'asc';
-
-        expect(state.all).to.eql(indices);
-        expect(state.queue).to.eql(indices);
-
-        state.complete.unshift(state.queue.shift());
-        expect(state.all).to.eql(indices);
-        expect(state.queue).to.eql(_.without(indices, indices[0]));
-      });
-
-      describe('', function () {
-        require('test_utils/no_digest_promises').activateForSuite();
-
-        it('sends a `null` status updated', function (done) {
-          var state = new SegmentedState(fakeSource, function (state) {
-            state.on('status', function (status) {
-              expect(status).to.have.property('active', null);
-              done();
-            });
-          });
-        });
-      });
-    });
-
-    describe('#getSourceStateFromRequest', function () {
-      require('test_utils/no_digest_promises').activateForSuite();
-
-      it('asynchronously returns a request state for each index', function () {
-        var state = new SegmentedState(fakeSource);
-
-        var req = fakeSource._createRequest(Promise.defer());
-
-        return Promise.all([
-          state.getSourceStateFromRequest(req),
-          state.getSourceStateFromRequest(req),
-          state.getSourceStateFromRequest(req)
-        ])
-        .then(function (requestStates) {
-          requestStates.forEach(function (reqState, i, list) {
-            expect(reqState.index).to.be(indices[i]);
-            expect(reqState.body).to.eql(flatSource.body);
-            expect(reqState.body).to.not.be(
-              (list[i - 1] || flatSource).body
-            );
-          });
-        });
-      });
-
-      it(
-        'manages size, emits events, and produces mergedResponse ' +
-        'until the last index in the queue, which causes the first ' +
-        'requests defer object to be resolved with the final merged response',
-        function (done) {
-          this.timeout(0);
-          var state = new SegmentedState(fakeSource);
-
-          var userDefer = Promise.defer();
-
-          var reqStates = [];
-          var responses = [];
-
-          var onEvent = sinon.stub();
-          var events = 'status first segment mergedSegment complete'.split(' ');
-          events.forEach(function (event) {
-            state.on(event, function (val) {
-              if (event === 'mergedSegment') val = _.cloneDeep(val);
-              onEvent(event, val);
-            });
-          });
-
-
-          function nextRequest(req) {
-            req = req || fakeSource._createRequest(userDefer);
-
-            state.getSourceStateFromRequest(req)
-            .then(function (sourceState) {
-              var resp;
-              if (responses.length === 2) {
-                resp = false; // mimic swallowed error
-              } else {
-                resp = {
-                  hits: {
-                    hits: new Array(10)
-                  }
-                };
-              }
-
-              reqStates.push(sourceState);
-              responses.push(resp);
-              req.defer.resolve(resp);
-            });
-          }
-
-          // when pending requests are pushed into the pending
-          // request queue, filter out the ones we are interested in
-          sinon.stub(requestQueue, 'push', function (req) {
-            if (req.segmented === state) nextRequest(req);
-          });
-
-          // kick off the request loop
-          nextRequest();
-
-          userDefer.promise.then(function (finalResponse) {
-            indices = indices.slice(0);
-
-            var total = indices.length;
-            expect(reqStates).to.have.length(total);
-
-            function event(name) {
-              var args = onEvent.args.shift();
-              expect(args[0]).to.be(name);
-              return args[1];
-            }
-
-            for (var i = 0; i < total; i++) {
-              var index = indices.shift();
-              var reqState = reqStates.shift();
-              var response = responses.shift();
-
-              var num = i + 1;
-              var remaining = indices.length;
-
-              // we always get a status
-              var status = event('status');
-              // only firt on the first
-              var first = num === 1 ? event('first') : null;
-              // third request is for a closed index, so no segment
-              var segment = num !== 3 ? event('segment') : null;
-              // third request is for a closed index, so no segment
-              var mergedSegment = num !== 3 ? event('mergedSegment') : null;
-              // only complete on last
-              var complete = remaining === 0 ? event('complete') : null;
-
-              expect(status).to.have.property('total', total);
-              expect(status).to.have.property('complete', i);
-              expect(status).to.have.property('remaining', remaining);
-              expect(status).to.have.property('active', index);
-
-              if (segment) {
-                expect(segment).to.be(response);
-              }
-
-              if (mergedSegment) {
-                expect(mergedSegment).to.not.be(response);
-
-                // account for the closed index/missing segment
-                var expectedHits = (num < 3 ? num : num - 1) * response.hits.hits.length;
-                expect(mergedSegment.hits.hits.length).to.be(expectedHits);
-              }
-            }
-          })
-          .nodeify(done);
-        }
-      );
-
-    });
-  }];
-});
\ No newline at end of file
diff --git a/test/unit/specs/components/courier/fetch/strategy/_segmented.js b/test/unit/specs/components/courier/fetch/strategy/_segmented.js
deleted file mode 100644
index b961abda2e6b..000000000000
--- a/test/unit/specs/components/courier/fetch/strategy/_segmented.js
+++ /dev/null
@@ -1,197 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var sinon = require('test_utils/auto_release_sinon');
-
-  var es;
-  var Promise;
-  var strategy;
-  var nextState;
-  var configFile;
-  var clientErrors;
-  var searchStrategy;
-  var SegmentedState;
-  var stubedSegmentedState;
-
-  return ['segmented fetch strategy', function () {
-    beforeEach(module('kibana', function (PrivateProvider) {
-      // stub the SegmentedState class
-      PrivateProvider.swap(
-        require('components/courier/fetch/segmented_state'),
-        function StubbedSegmentedStateProvider() {
-          return sinon.spy(function SegmentedState() {
-            stubedSegmentedState = this;
-            this.getSourceStateFromRequest = sinon.stub().returns(nextState = {});
-          });
-        }
-      );
-    }));
-
-    beforeEach(inject(function ($injector, Private) {
-      es = $injector.get('es');
-      Promise = $injector.get('Promise');
-      strategy = Private(require('components/courier/fetch/strategy/segmented'));
-      configFile = $injector.get('configFile');
-      clientErrors = $injector.get('esFactory').errors;
-      searchStrategy = Private(require('components/courier/fetch/strategy/search'));
-      SegmentedState = Private(require('components/courier/fetch/segmented_state'));
-    }));
-
-    function ClientError(status, message) {
-      var err = new clientErrors[status](message);
-      err.status = status;
-      return err;
-    }
-
-    describe('#clientMethod', function () {
-      require('test_utils/no_digest_promises').activateForSuite();
-
-      it('describes an actual method on the client', function () {
-        expect(es[strategy.clientMethod]).to.be.a('function');
-      });
-
-      it('filters out "index closed" errors', function () {
-        var filteredError = new ClientError(403, 'ClusterBlockException because index closed');
-        sinon.stub(es, 'msearch').returns(Promise.reject(filteredError));
-        var football = {};
-
-        return es[strategy.clientMethod](football)
-        .then(function shouldExec(resp) {
-          expect(resp).to.be(false);
-          expect(es.msearch).to.have.property('callCount', 1);
-          expect(es.msearch.getCall(0).args[0]).to.be(football);
-        })
-        .catch(function shouldNotExec() {
-          expect().fail('The error should have been swallowed');
-        });
-      });
-
-      it('lets other errors through', function () {
-        var notFilteredError = new ClientError(500);
-        sinon.stub(es, 'msearch').returns(Promise.reject(notFilteredError));
-        var football = {};
-
-        return es[strategy.clientMethod](football)
-        .then(function shouldNotExec() {
-          expect().fail('The error should have been swallowed');
-        })
-        .catch(function shouldExec(err) {
-          expect(err).to.be(notFilteredError);
-          expect(es.msearch).to.have.property('callCount', 1);
-          expect(es.msearch.args[0][0]).to.be(football);
-        });
-      });
-    });
-
-    describe('#getSourceStateFromRequest', function () {
-      it('instanciates the SegmentedState, calls getSourceStateFromRequest on it', function () {
-        var req = {
-          source: {},
-          defer: {},
-          segmented: true,
-          init: _.noop
-        };
-
-        expect(SegmentedState).to.have.property('callCount', 0);
-
-        var state = strategy.getSourceStateFromRequest(req);
-
-        expect(SegmentedState).to.have.property('callCount', 1);
-
-        var call = SegmentedState.getCall(0);
-        expect(call.args[0]).to.be(req.source);
-        expect(call.args[1]).to.be(req.init);
-
-        expect(req.segmented).to.be(stubedSegmentedState);
-        expect(stubedSegmentedState.getSourceStateFromRequest).to.have.property('callCount', 1);
-        expect(state).to.be(nextState);
-      });
-
-      it('reuses the SegmentedState, calls getSourceStateFromRequest on it', function () {
-        var req = {
-          source: {},
-          defer: {},
-          segmented: true,
-          init: _.noop
-        };
-
-        expect(SegmentedState).to.have.property('callCount', 0);
-
-        var state = strategy.getSourceStateFromRequest(req);
-
-        expect(SegmentedState).to.have.property('callCount', 1);
-
-        var call = SegmentedState.getCall(0);
-        expect(call.args[0]).to.be(req.source);
-        expect(call.args[1]).to.be(req.init);
-
-        expect(req.segmented).to.be(stubedSegmentedState);
-        expect(stubedSegmentedState.getSourceStateFromRequest).to.have.property('callCount', 1);
-        expect(state).to.be(nextState);
-      });
-    });
-
-    describe('#convertStatesToBody', function () {
-      it('reads the states into new-line delimited json with proper search params', function () {
-        var states = [
-          { index: 'index', type: 'type', body: { req: 'body' } },
-          { index: 'index', type: 'type', body: { req: 'body' } },
-          { index: 'index', type: 'type', body: { req: 'body' } }
-        ];
-        var count = states.length;
-
-        var expectedBody = { req: 'body' };
-        var expectedParams = {
-          index: 'index',
-          type: 'type',
-          ignore_unavailable: true,
-          timeout: configFile.shard_timeout
-        };
-
-        var docs = strategy.convertStatesToBody(states).split('\n').filter(Boolean);
-        expect(docs).to.have.length(6);
-
-        _.times(count, function () {
-          var params = docs.shift();
-          var body = docs.shift();
-
-          expect(JSON.parse(body)).to.eql(expectedBody);
-          expect(JSON.parse(params)).to.eql(expectedParams);
-        });
-
-      });
-    });
-
-    describe('#getIncompleteRequests', function () {
-      it('exists', function () {
-        expect(strategy.getIncompleteRequests).to.be.a('function');
-      });
-
-      it('filters out pending requests that have SegmentedState attached', function () {
-        var fakeSearchSource = {
-          _getType: _.constant('search')
-        };
-
-        var target = {
-          source: fakeSearchSource,
-          segmented: new SegmentedState()
-        };
-
-        var requests = _.shuffle([
-          target,
-          {
-            source: fakeSearchSource,
-            segmented: true
-          },
-          {
-            source: fakeSearchSource,
-            segmented: false
-          }
-        ]);
-
-        var pending = strategy.getIncompleteRequests(requests);
-        expect(pending).to.have.length(1);
-        expect(pending[0]).to.be(target);
-      });
-    });
-  }];
-});
\ No newline at end of file

From dd660019b8180c6504d918066db8d175de4b0cc9 Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Fri, 19 Dec 2014 12:42:45 -0700
Subject: [PATCH 48/57] [courier/looper] allow preventing fetch on restart

---
 .../components/courier/looper/_looper.js      | 28 +++++++++++++++----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/kibana/components/courier/looper/_looper.js b/src/kibana/components/courier/looper/_looper.js
index 954bdde0e4f9..6f5eb3d8589f 100644
--- a/src/kibana/components/courier/looper/_looper.js
+++ b/src/kibana/components/courier/looper/_looper.js
@@ -42,12 +42,18 @@ define(function (require) {
        *
        * @chainable
        */
-      looper.start = function () {
+      looper.start = function (loopOver) {
+        if (loopOver == null) loopOver = true;
+
         looper.stop();
         _started = true;
 
-        // start with a run of the loop, which sets the next run
-        looper._looperOver();
+        if (loopOver) {
+          // start with a run of the loop, which sets the next run
+          looper._looperOver();
+        } else {
+          looper._scheduleLoop();
+        }
 
         return this;
       };
@@ -71,8 +77,7 @@ define(function (require) {
        */
       looper.restart = function () {
         if (looper.started()) {
-          looper.stop();
-          looper.start();
+          looper.start(false);
         }
         return this;
       };
@@ -118,7 +123,7 @@ define(function (require) {
           looper.onHastyLoop();
         }
 
-        _timerId = _ms ? $timeout(looper._looperOver, _ms) : null;
+        looper._scheduleLoop();
 
         looper.active = Promise
         .try(fn)
@@ -131,6 +136,17 @@ define(function (require) {
         });
       };
 
+      /**
+       * Schedule the next itteration of the loop
+       *
+       * @private
+       * @return {number} - the timer promise
+       */
+      looper._scheduleLoop = function () {
+        _timerId = _ms ? $timeout(looper._looperOver, _ms) : null;
+        return _timerId;
+      };
+
       /**
        * execute the _fn, and restart the timer
        */

From 3b7ad9c8a11dcc7c9323ca9be5783b6c86d36d13 Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Fri, 19 Dec 2014 12:44:28 -0700
Subject: [PATCH 49/57] [timepicker] fix bag merge

---
 src/kibana/components/timepicker/timepicker.html | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/kibana/components/timepicker/timepicker.html b/src/kibana/components/timepicker/timepicker.html
index 619b7f4ee395..572a57b280b7 100644
--- a/src/kibana/components/timepicker/timepicker.html
+++ b/src/kibana/components/timepicker/timepicker.html
@@ -164,12 +164,11 @@
     <!-- Refresh Intervals -->
     <div ng-show="tab == 'interval'" role="tabpanel" class="tab-pane active">
       <br>
-      <ul class="list-unstyled kbn-refresh-list">
-        <li ng-repeat="interval in refreshIntervals">
-          <a ng-click="setRefreshInterval(interval)">{{interval.display}}</a>
-        </li>
-      </ul>
+      <div ng-repeat="list in refreshLists" class="kbn-refresh-section">
+        <ul class="list-unstyled">
+          <li ng-repeat="interval in list"><a ng-click="setRefreshInterval(interval)">{{interval.display}}</a></li>
+        </ul>
+      </div>
     </div>
-
   </div>
 </div>

From ca7f216f33fb6433f275e8e85b2a8e3c85333fc6 Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Fri, 19 Dec 2014 12:44:51 -0700
Subject: [PATCH 50/57] [timepicker] readability improvments

---
 src/kibana/components/timepicker/timepicker.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/kibana/components/timepicker/timepicker.js b/src/kibana/components/timepicker/timepicker.js
index 1df818b325c4..29f0dc39b7e9 100644
--- a/src/kibana/components/timepicker/timepicker.js
+++ b/src/kibana/components/timepicker/timepicker.js
@@ -30,12 +30,8 @@ define(function (require) {
         $scope.modes = ['quick', 'relative', 'absolute'];
         if (_.isUndefined($scope.mode)) $scope.mode = 'quick';
 
-        $scope.quickLists = _.map(_.uniq(_.pluck(quickRanges, 'section')), function (section) {
-          return _.filter(quickRanges, {section: section});
-        });
-        $scope.refreshLists = _.map(_.uniq(_.pluck(refreshIntervals, 'section')), function (section) {
-          return _.filter(refreshIntervals, {section: section});
-        });
+        $scope.quickLists = _(quickRanges).groupBy('section').values().value();
+        $scope.refreshLists = _(refreshIntervals).groupBy('section').values().value();
 
         $scope.relative = {
           count: 1,

From 12bc60780c63d6c872a1563a00eae648fc51344d Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Fri, 19 Dec 2014 12:51:35 -0700
Subject: [PATCH 51/57] [courier/fetch] remove fetch method for removed
 segmented strategy

---
 src/kibana/components/courier/courier.js       | 5 +----
 src/kibana/components/courier/fetch/fetch.js   | 5 -----
 src/kibana/components/courier/looper/search.js | 2 +-
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/kibana/components/courier/courier.js b/src/kibana/components/courier/courier.js
index 879f59791bfa..5f7e000d5d41 100644
--- a/src/kibana/components/courier/courier.js
+++ b/src/kibana/components/courier/courier.js
@@ -59,10 +59,7 @@ define(function (require) {
        * individual errors are routed to their respective requests.
        */
       self.fetch = function () {
-        return Promise.all([
-          fetch.searches(),
-          fetch.segmentedSearches()
-        ]);
+        fetch.searches();
       };
 
 
diff --git a/src/kibana/components/courier/fetch/fetch.js b/src/kibana/components/courier/fetch/fetch.js
index 50a9458d8fc9..90f7736dcb76 100644
--- a/src/kibana/components/courier/fetch/fetch.js
+++ b/src/kibana/components/courier/fetch/fetch.js
@@ -28,11 +28,6 @@ define(function (require) {
      */
     this.searches = _.partial(fetchPending, strategies.search);
 
-    /**
-     * Fetch all pending search requests
-     * @async
-     */
-    this.segmentedSearches = _.partial(fetchPending, strategies.segmented);
 
     function fetchASource(source, strategy) {
       strategy = strategy || strategies[source._getType()];
diff --git a/src/kibana/components/courier/looper/search.js b/src/kibana/components/courier/looper/search.js
index 8cf5d9c055e8..40f19722ddde 100644
--- a/src/kibana/components/courier/looper/search.js
+++ b/src/kibana/components/courier/looper/search.js
@@ -14,7 +14,7 @@ define(function (require) {
      * @type {Looper}
      */
     var searchLooper = new Looper(null, function () {
-      return Promise.all([fetch.searches(), fetch.segmentedSearches()]);
+      return fetch.searches();
     });
 
     searchLooper.onHastyLoop = function () {

From 24960368946248b5b592060a15fd778200ba2660 Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Fri, 19 Dec 2014 13:27:02 -0700
Subject: [PATCH 52/57] [courier/source] update method used to cancel requests

---
 src/kibana/components/courier/data_source/_abstract.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/kibana/components/courier/data_source/_abstract.js b/src/kibana/components/courier/data_source/_abstract.js
index 0c1ba99f4cc8..9063304e9bee 100644
--- a/src/kibana/components/courier/data_source/_abstract.js
+++ b/src/kibana/components/courier/data_source/_abstract.js
@@ -186,7 +186,7 @@ define(function (require) {
      * @return {undefined}
      */
     SourceAbstract.prototype.cancelPendingReq = function () {
-      _.invoke(this._myPendingReq(), 'cancel');
+      _.invoke(this._myPendingReq(), 'abort');
     };
 
     /**

From a1977a3babe9b25d3e553052a532fdb0f06b703f Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Fri, 19 Dec 2014 13:37:24 -0700
Subject: [PATCH 53/57] [courier] fix moved method

---
 src/kibana/components/courier/data_source/_doc_send_to_es.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/kibana/components/courier/data_source/_doc_send_to_es.js b/src/kibana/components/courier/data_source/_doc_send_to_es.js
index 6eca252b216d..76ba9b96296b 100644
--- a/src/kibana/components/courier/data_source/_doc_send_to_es.js
+++ b/src/kibana/components/courier/data_source/_doc_send_to_es.js
@@ -51,7 +51,7 @@ define(function (require) {
 
             if (keyMatches) {
               // resolve the request with a copy of the response
-              req.resolve(_.cloneDeep(fetchResp));
+              req.handleResponse(_.cloneDeep(fetchResp));
               return;
             }
 

From 103297a8bfe8c3e44b71b3e990b87b5c8959c718 Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Fri, 19 Dec 2014 13:48:02 -0700
Subject: [PATCH 54/57] [courier/fetch] use ABORT to id canceled es request

---
 src/kibana/components/courier/fetch/_call_client.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/kibana/components/courier/fetch/_call_client.js b/src/kibana/components/courier/fetch/_call_client.js
index 3503138bce6c..a4a52278df4c 100644
--- a/src/kibana/components/courier/fetch/_call_client.js
+++ b/src/kibana/components/courier/fetch/_call_client.js
@@ -35,14 +35,12 @@ define(function (require) {
           return;
         }
 
-        if (esPromise) {
-          // cancel active request
+        if (esPromise && _.isFunction(esPromise.abort)) {
           esPromise.abort();
-        } else {
-          // prevent request creation
-          esPromise = false;
         }
 
+        esPromise = ABORTED;
+
         return respond();
       });
 
@@ -63,7 +61,8 @@ define(function (require) {
 
       Promise.resolve(strategy.convertReqsToBody(executable))
       .then(function (body) {
-        if (esPromise != null) {
+        // while the strategy was converting, our request was aborted
+        if (esPromise === ABORTED) {
           throw ABORTED;
         }
 

From 7fcab33cb29738da0c1b0a9707e8f34402f23e31 Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Fri, 19 Dec 2014 13:48:38 -0700
Subject: [PATCH 55/57] [courier/fetch] added comments

---
 .../components/courier/fetch/_call_client.js       | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/kibana/components/courier/fetch/_call_client.js b/src/kibana/components/courier/fetch/_call_client.js
index a4a52278df4c..8c30b5ef9d35 100644
--- a/src/kibana/components/courier/fetch/_call_client.js
+++ b/src/kibana/components/courier/fetch/_call_client.js
@@ -10,14 +10,18 @@ define(function (require) {
     var INCOMPLETE = Private(require('components/courier/fetch/_req_status')).INCOMPLETE;
 
     function callClient(strategy, requests) {
+      // merging docs can change status to DUPLICATE, capture new statuses
       var statuses = mergeDuplicateRequests(requests);
 
+      // get the actual list of requests that we will be fetching
       var executable = statuses.filter(isRequest);
       var execCount = executable.length;
 
+      // resolved by respond()
       var esPromise;
       var defer = Promise.defer();
 
+      // attach abort handlers, close over request index
       statuses.forEach(function (req, i) {
         if (!isRequest(req)) return;
         req.whenAborted(function () {
@@ -25,6 +29,7 @@ define(function (require) {
         });
       });
 
+      // handle a request being aborted while being fetched
       var requestWasAborted = Promise.method(function (req, i) {
         if (statuses[i] === ABORTED) {
           defer.reject(new Error('Request was aborted twice?'));
@@ -32,6 +37,7 @@ define(function (require) {
 
         execCount -= 1;
         if (execCount > 0) {
+          // the multi-request still contains other requests
           return;
         }
 
@@ -44,6 +50,7 @@ define(function (require) {
         return respond();
       });
 
+      // for each respond with either the response or ABORTED
       var respond = function (responses) {
         responses = responses || [];
         return Promise.map(requests, function (req, i) {
@@ -59,6 +66,8 @@ define(function (require) {
         .then(defer.resolve, defer.reject);
       };
 
+      // Now that all of THAT^^^ is out of the way, lets actually
+      // call out to elasticsearch
       Promise.resolve(strategy.convertReqsToBody(executable))
       .then(function (body) {
         // while the strategy was converting, our request was aborted
@@ -81,7 +90,10 @@ define(function (require) {
         else defer.reject(err);
       });
 
-      return defer.promise.catch(function (err) {
+      // return our promise, but catch any errors we create and
+      // send them to the requests
+      return defer.promise
+      .catch(function (err) {
         requests.forEach(function (req, i) {
           if (statuses[i] !== ABORTED) {
             req.handleFailure(err);

From 668b5cf90c6459e752dd757e54ca75b1dcabca7b Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Fri, 19 Dec 2014 14:05:47 -0700
Subject: [PATCH 56/57] [kibana] remove debug code

---
 .../plugins/discover/controllers/discover.js       |  1 -
 src/kibana/plugins/kibana/index.js                 | 14 --------------
 src/kibana/plugins/kibana/kibana.html              |  4 ----
 3 files changed, 19 deletions(-)

diff --git a/src/kibana/plugins/discover/controllers/discover.js b/src/kibana/plugins/discover/controllers/discover.js
index 2a0bfe01ff68..7c1eab607f87 100644
--- a/src/kibana/plugins/discover/controllers/discover.js
+++ b/src/kibana/plugins/discover/controllers/discover.js
@@ -309,7 +309,6 @@ define(function (require) {
         sortFn = new HitSortFn(sort[1]);
       }
 
-      segmented.setTotalSize(sortBy === 'non-time' ? false : totalSize);
       segmented.setDirection(sortBy === 'time' ? sort[1] : 'desc');
 
       // triggered when the status updated
diff --git a/src/kibana/plugins/kibana/index.js b/src/kibana/plugins/kibana/index.js
index f7fb3f8ca8be..e532cd058250 100644
--- a/src/kibana/plugins/kibana/index.js
+++ b/src/kibana/plugins/kibana/index.js
@@ -40,20 +40,6 @@ define(function (require) {
           notify.fatal(err);
         });
 
-        $scope.courierRequestQueue = Private(require('components/courier/_request_queue'));
-        $scope.courierRequestStats = {};
-
-        $rootScope.$watchCollection('courierRequestQueue', function (queue) {
-          _.forOwn($scope.courierRequestStats, function (v, name, stats) {
-            stats[name] = 0;
-          });
-
-          queue.forEach(function (req) {
-            $scope.courierRequestStats[req.type] = ($scope.courierRequestStats[req.type] || 0) + 1;
-          });
-        });
-
-
         // run init functions before loading the mixins, so that we can ensure that
         // the environment is ready for them to get and use their dependencies
         self.ready = Promise.all([ kbnSetup(), config.init() ])
diff --git a/src/kibana/plugins/kibana/kibana.html b/src/kibana/plugins/kibana/kibana.html
index 45d5640859ec..dc15756a8a57 100644
--- a/src/kibana/plugins/kibana/kibana.html
+++ b/src/kibana/plugins/kibana/kibana.html
@@ -28,10 +28,6 @@
             <div class="spinner"></div>
           </li>
 
-          <span class="navbar-text" ng-repeat="(name, stat) in courierRequestStats">
-            {{name}}:{{stat}}
-          </span>
-
           <li ng-if="setupComplete" ng-show="timefilter.enabled" class="navbar-timepicker-container">
             <a ng-click="toggleTimepicker()">
               <span ng-show="timefilter.refreshInterval.value > 0" class="navbar-timepicker-auto-refresh-desc">

From 1fdf755f3a34179df5cc2118a7648278dc61074a Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Fri, 19 Dec 2014 14:10:32 -0700
Subject: [PATCH 57/57] [courier/fetch/segmented] infer the totalSize from the
 flattened search source

---
 .../fetch/request/_segmented_handle.js        | 22 ++++++++++++++-----
 .../courier/fetch/request/segmented.js        | 20 ++++++++++++++---
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/src/kibana/components/courier/fetch/request/_segmented_handle.js b/src/kibana/components/courier/fetch/request/_segmented_handle.js
index 518f0ee727b1..3af37cba8e08 100644
--- a/src/kibana/components/courier/fetch/request/_segmented_handle.js
+++ b/src/kibana/components/courier/fetch/request/_segmented_handle.js
@@ -3,18 +3,28 @@ define(function (require) {
     var _ = require('lodash');
     var Events = Private(require('factories/events'));
 
+
+    /**
+     * Simple class for creating an object to send to the
+     * requester of a SegmentedRequest. Since the SegmentedRequest
+     * extends AbstractRequest, it wasn't able to be the event
+     * emitter it was born to be. This provides a channel for
+     * setting values on the segmented request, and an event
+     * emitter for the request to speak outwardly
+     *
+     * @param {SegmentedRequest} - req - the requst this handle relates to
+     */
     _(SegmentedHandle).inherits(Events);
     function SegmentedHandle(req) {
       SegmentedHandle.Super.call(this);
       this._req = req;
     }
 
-    SegmentedHandle.prototype.setTotalSize = function (totalSize) {
-      var req = this._req;
-      totalSize = _.parseInt(totalSize);
-      return (req._totalSize = totalSize || false);
-    };
-
+    /**
+     * Set the sort direction for the request.
+     *
+     * @param {string} dir - one of 'asc' or 'desc'
+     */
     SegmentedHandle.prototype.setDirection = function (dir) {
       switch (dir) {
       case 'asc':
diff --git a/src/kibana/components/courier/fetch/request/segmented.js b/src/kibana/components/courier/fetch/request/segmented.js
index 264d3d1d9945..a6422418d729 100644
--- a/src/kibana/components/courier/fetch/request/segmented.js
+++ b/src/kibana/components/courier/fetch/request/segmented.js
@@ -18,6 +18,7 @@ define(function (require) {
       // segmented request specific state
       this._initFn = initFn;
       this._totalSize = false;
+      this._remainingSize = false;
       this._direction = 'desc';
       this._handle = new SegmentedHandle(this);
 
@@ -25,7 +26,6 @@ define(function (require) {
       // parameters via the handle
       if (_.isFunction(initFn)) initFn(this._handle);
 
-      this._remainingSize = this._totalSize !== false ? this._totalSize : false;
       this._createQueue();
       this._all = this._queue.slice(0);
       this._complete = [];
@@ -42,7 +42,7 @@ define(function (require) {
       };
 
       // prevent the source from changing between requests
-      this._flattenSource = _.once(function () { return this.source._flatten(); });
+      this._getFlattenedSource = _.once(this._getFlattenedSource);
 
       // send out the initial status
       this._reportStatus();
@@ -65,7 +65,7 @@ define(function (require) {
     SegmentedReq.prototype.getFetchParams = function () {
       var self = this;
 
-      return self._flattenSource()
+      return self._getFlattenedSource()
       .then(function (flatSource) {
         var params = _.cloneDeep(flatSource);
         var index = self._active = self._queue.shift();
@@ -121,6 +121,20 @@ define(function (require) {
       });
     };
 
+    SegmentedReq.prototype._getFlattenedSource = function () {
+      var self = this;
+
+      return self.source._flatten()
+      .then(function (flatSource) {
+        var size = _.parseInt(_.deepGet(flatSource, 'body.size'));
+        if (_.isNumber(size)) {
+          self._totalSize = self._remainingSize = size;
+        }
+
+        return flatSource;
+      });
+    };
+
     SegmentedReq.prototype._consumeSegment = function (seg) {
       this._segments.push(seg);