github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-25 02:09:32 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4301 from simianhacker/fix/3482

Browse source 
Elasticsearch 2.0 Compatibility Fixes
This commit is contained in:
Rashid Khan 2015-06-23 11:17:32 -07:00
commit 888be7afc1
5 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/kibana/components/agg_types/buckets/create_filter/date_range.js
View file

@ -10,6 +10,7 @@ define(function (require) {
var filter = {}; var filter = {};
if (range.from) filter.gte = +range.from; if (range.from) filter.gte = +range.from;
if (range.to) filter.lt = +range.to; 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); return buildRangeFilter(agg.params.field, filter, agg.vis.indexPattern);
}; };

3
src/kibana/components/agg_types/buckets/date_histogram.js
View file

@ -93,8 +93,7 @@ define(function (require) {
var interval = agg.buckets.getInterval(); var interval = agg.buckets.getInterval();
output.bucketInterval = interval; output.bucketInterval = interval;
output.params.interval = interval.expression; output.params.interval = interval.expression;
output.params.pre_zone = tzOffset; output.params.time_zone = tzOffset;
output.params.pre_zone_adjust_large_interval = true;
var scaleMetrics = interval.scaled && interval.scale < 1; var scaleMetrics = interval.scaled && interval.scale < 1;
if (scaleMetrics) { if (scaleMetrics) {

3
src/kibana/components/timefilter/timefilter.js
View file

@ -83,7 +83,8 @@
filter = {range : {}}; filter = {range : {}};
filter.range[timefield.name] = { filter.range[timefield.name] = {
gte: bounds.min.valueOf(), gte: bounds.min.valueOf(),
lte: bounds.max.valueOf() lte: bounds.max.valueOf(),
format: 'epoch_millis'
}; };
} }

2
src/kibana/index.js
View file

@ -34,7 +34,7 @@ define(function (require) {
// Use this for cache busting partials // Use this for cache busting partials
.constant('cacheBust', window.KIBANA_COMMIT_SHA) .constant('cacheBust', window.KIBANA_COMMIT_SHA)
// The minimum Elasticsearch version required to run Kibana // 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 // When we need to identify the current session of the app, ef shard preference
.constant('sessionId', Date.now()) .constant('sessionId', Date.now())
// attach the route manager's known routes // attach the route manager's known routes

2
tasks/config/esvm.js
View file

@ -7,7 +7,7 @@ module.exports = function (grunt) {
return { return {
options: { options: {
directory: directory, directory: directory,
version: '1.4.4', branch: 'master',
plugins: [ plugins: [
'elasticsearch/marvel/latest' 'elasticsearch/marvel/latest'
], ],