mirror of
https://github.com/elastic/kibana.git
synced 2025-04-24 09:48:58 -04:00
Merge branch 'master' of github.com:elastic/kibana into install-plugin
This commit is contained in:
commit
c0f114d94c
5 changed files with 6 additions and 5 deletions
|
@ -10,6 +10,7 @@ define(function (require) {
|
|||
var filter = {};
|
||||
if (range.from) filter.gte = +range.from;
|
||||
if (range.to) filter.lt = +range.to;
|
||||
if (range.to && range.from) filter.format = 'epoch_millis';
|
||||
|
||||
return buildRangeFilter(agg.params.field, filter, agg.vis.indexPattern);
|
||||
};
|
||||
|
|
|
@ -93,8 +93,7 @@ define(function (require) {
|
|||
var interval = agg.buckets.getInterval();
|
||||
output.bucketInterval = interval;
|
||||
output.params.interval = interval.expression;
|
||||
output.params.pre_zone = tzOffset;
|
||||
output.params.pre_zone_adjust_large_interval = true;
|
||||
output.params.time_zone = tzOffset;
|
||||
|
||||
var scaleMetrics = interval.scaled && interval.scale < 1;
|
||||
if (scaleMetrics) {
|
||||
|
|
|
@ -83,7 +83,8 @@
|
|||
filter = {range : {}};
|
||||
filter.range[timefield.name] = {
|
||||
gte: bounds.min.valueOf(),
|
||||
lte: bounds.max.valueOf()
|
||||
lte: bounds.max.valueOf(),
|
||||
format: 'epoch_millis'
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
@ -34,7 +34,7 @@ define(function (require) {
|
|||
// Use this for cache busting partials
|
||||
.constant('cacheBust', window.KIBANA_COMMIT_SHA)
|
||||
// The minimum Elasticsearch version required to run Kibana
|
||||
.constant('minimumElasticsearchVersion', '1.4.4')
|
||||
.constant('minimumElasticsearchVersion', '2.0.0')
|
||||
// When we need to identify the current session of the app, ef shard preference
|
||||
.constant('sessionId', Date.now())
|
||||
// attach the route manager's known routes
|
||||
|
|
|
@ -7,7 +7,7 @@ module.exports = function (grunt) {
|
|||
return {
|
||||
options: {
|
||||
directory: directory,
|
||||
version: '1.4.4',
|
||||
branch: 'master',
|
||||
plugins: [
|
||||
'elasticsearch/marvel/latest'
|
||||
],
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue