Merge branch 'master' of github.com:elastic/kibana into renameAllFiles

Author: spalger

src/plugins/elasticsearch/lib/__tests__/routes.js

@@ -98,7 +98,7 @@ describe('plugins/elasticsearch', function () {
     testRoute({
       method: 'POST',
       url: '/elasticsearch/_msearch?timeout=0&ignore_unavailable=true&preference=1429577952339',
-      payload: '{"index":"logstash-2015.04.21","ignore_unavailable":true}\n{"size":500,"sort":{"@timestamp":"desc"},"query":{"bool":{"must":[{"query_string":{"analyze_wildcard":true,"query":"*"}},{"bool":{"must":[{"range":{"@timestamp":{"gte":1429577068175,"lte":1429577968175}}}],"must_not":[]}}],"must_not":[]}},"highlight":{"pre_tags":["@kibana-highlighted-field@"],"post_tags":["@/kibana-highlighted-field@"],"fields":{"*":{}}},"aggs":{"2":{"date_histogram":{"field":"@timestamp","interval":"30s","pre_zone":"-07:00","pre_zone_adjust_large_interval":true,"min_doc_count":0,"extended_bounds":{"min":1429577068175,"max":1429577968175}}}},"fields":["*","_source"],"script_fields":{},"fielddata_fields":["timestamp_offset","@timestamp","utc_time"]}\n' // eslint-disable-line max-len
+      payload: '{"index":"logstash-2015.04.21","ignore_unavailable":true}\n{"size":500,"sort":{"@timestamp":"desc"},"query":{"bool":{"must":[{"query_string":{"analyze_wildcard":true,"query":"*"}},{"bool":{"must":[{"range":{"@timestamp":{"gte":1429577068175,"lte":1429577968175}}}],"must_not":[]}}],"must_not":[]}},"highlight":{"pre_tags":["@kibana-highlighted-field@"],"post_tags":["@/kibana-highlighted-field@"],"fields":{"*":{}}},"aggs":{"2":{"date_histogram":{"field":"@timestamp","interval":"30s","min_doc_count":0,"extended_bounds":{"min":1429577068175,"max":1429577968175}}}},"fields":["*","_source"],"script_fields":{},"fielddata_fields":["timestamp_offset","@timestamp","utc_time"]}\n' // eslint-disable-line max-len
     });
 
   });

src/ui/public/agg_types/metrics/percentile_ranks.js

@@ -4,8 +4,9 @@ import 'ui/number_list';
 import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/metric_agg_type';
 import AggTypesMetricsGetResponseAggConfigClassProvider from 'ui/agg_types/metrics/get_response_agg_config_class';
 import RegistryFieldFormatsProvider from 'ui/registry/field_formats';
-export default function AggTypeMetricPercentileRanksProvider(Private) {
+import getPercentileValue from './percentiles_get_value';
 
+export default function AggTypeMetricPercentileRanksProvider(Private) {
   var MetricAggType = Private(AggTypesMetricsMetricAggTypeProvider);
   var getResponseAggConfigClass = Private(AggTypesMetricsGetResponseAggConfigClassProvider);
   var fieldFormats = Private(RegistryFieldFormatsProvider);
@@ -49,11 +50,7 @@ export default function AggTypeMetricPercentileRanksProvider(Private) {
       return fieldFormats.getInstance('percent') || fieldFormats.getDefaultInstance('number');
     },
     getValue: function (agg, bucket) {
-      // values for 1, 5, and 10 will come back as 1.0, 5.0, and 10.0 so we
-      // parse the keys and respond with the value that matches
-      return _.find(bucket[agg.parentId] && bucket[agg.parentId].values, function (value, key) {
-        return agg.key === parseFloat(key);
-      }) / 100;
+      return getPercentileValue(agg, bucket) / 100;
     }
   });
 };

src/ui/public/agg_types/metrics/percentiles.js

@@ -5,8 +5,9 @@ import 'ui/number_list';
 import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/metric_agg_type';
 import AggTypesMetricsGetResponseAggConfigClassProvider from 'ui/agg_types/metrics/get_response_agg_config_class';
 import RegistryFieldFormatsProvider from 'ui/registry/field_formats';
-export default function AggTypeMetricPercentilesProvider(Private) {
+import getPercentileValue from './percentiles_get_value';
 
+export default function AggTypeMetricPercentilesProvider(Private) {
   var MetricAggType = Private(AggTypesMetricsMetricAggTypeProvider);
   var getResponseAggConfigClass = Private(AggTypesMetricsGetResponseAggConfigClassProvider);
   var fieldFormats = Private(RegistryFieldFormatsProvider);
@@ -43,12 +44,6 @@ export default function AggTypeMetricPercentilesProvider(Private) {
         return new ValueAggConfig(percent);
       });
     },
-    getValue: function (agg, bucket) {
-      // percentiles for 1, 5, and 10 will come back as 1.0, 5.0, and 10.0 so we
-      // parse the keys and respond with the value that matches
-      return _.find(bucket[agg.parentId] && bucket[agg.parentId].values, function (value, key) {
-        return agg.key === parseFloat(key);
-      });
-    }
+    getValue: getPercentileValue
   });
 };

src/ui/public/agg_types/metrics/percentiles_get_value.js

@@ -0,0 +1,7 @@
+import { find } from 'lodash';
+
+export default function getPercentileValue(agg, bucket) {
+  const values = bucket[agg.parentId] && bucket[agg.parentId].values;
+  const percentile = find(values, value => agg.key === value.key);
+  return percentile ? percentile.value : NaN;
+}

src/ui/public/promises/promises.js

@@ -71,7 +71,7 @@ module.service('Promise', function ($q, $timeout) {
   });
   Promise.try = function (fn, args, ctx) {
     if (typeof fn !== 'function') {
-      return Promise.reject('fn must be a function');
+      return Promise.reject(new TypeError('fn must be a function'));
     }
 
     var value;