Skip to content

Don't use extended_bounds for time filter in date_histogram #6643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rashidkpc merged 3 commits into from
Mar 28, 2016
Merged

Don't use extended_bounds for time filter in date_histogram #6643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e95e577
Don't use extended_bounds for time filter in date_histogram vis
colings86 Mar 24, 2016
5c492e7
[discover/tests] update rigid test data
spalger Mar 24, 2016
184c0a3
Merge pull request #1 from spalger/pr/6643
colings86 Mar 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/plugins/kibana/public/discover/controllers/discover.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,8 +481,7 @@ app.controller('discover', function ($scope, config, courier, $route, $window, N
schema: 'segment',
params: {
field: $scope.opts.timefield,
interval: $state.interval,
min_doc_count: 0
interval: $state.interval
}
}
];
Expand Down
8 changes: 0 additions & 8 deletions src/ui/public/agg_types/buckets/date_histogram.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,14 +150,6 @@ export default function DateHistogramAggType(timefilter, config, Private) {

return;
}

var bounds = timefilter.getActiveBounds();
if (bounds) {
output.params.extended_bounds = {
min: moment(bounds.min).valueOf(),
max: moment(bounds.max).valueOf()
};
}
}
}
]
Expand Down
18 changes: 7 additions & 11 deletions test/functional/apps/discover/_discover.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,11 @@ define(function (require) {
});

bdd.it('should show the correct bar chart', function () {
var expectedBarChartData = [ '0', '0', '0', '0', '0', '0', '3.237',
var expectedBarChartData = [ '3.237',
'17.674', '64.75', '125.737', '119.962', '65.712', '16.449',
'2.712', '3.675', '17.674', '59.762', '119.087', '123.812',
'61.862', '15.487', '2.362', '2.800', '15.312', '61.862', '123.2',
'118.562', '63.524', '17.587', '2.537', '0', '0', '0', '0', '0',
'0', '0'
'118.562', '63.524', '17.587', '2.537'
];
return common.sleep(4000)
.then(function () {
Expand Down Expand Up @@ -142,8 +141,7 @@ define(function (require) {

bdd.it('should show correct data for chart interval Hourly', function () {
var chartInterval = 'Hourly';
var expectedBarChartData = [ '0', '0', '0', '0', '0', '0', '0', '0',
'0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1.527', '2.290',
var expectedBarChartData = [ '1.527', '2.290',
'5.599', '7.890', '13.236', '30.290', '46.072', '55.490', '86.8',
'112', '122.181', '131.6', '132.872', '113.527', '102.581',
'81.709', '65.672', '43.781', '24.181', '14', '9.672', '6.109',
Expand All @@ -154,8 +152,7 @@ define(function (require) {
'2.036', '1.781', '4.327', '8.654', '9.418', '26.472', '38.945',
'61.345', '79.672', '102.836', '125.236', '130.327', '128.036',
'120.4', '96.472', '74.581', '70.509', '39.709', '25.199', '13.490',
'12.472', '4.072', '2.290', '1.018', '0', '0', '0', '0', '0', '0',
'0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0'
'12.472', '4.072', '2.290', '1.018'
];
return discoverPage.setChartInterval(chartInterval)
.then(function () {
Expand All @@ -170,7 +167,7 @@ define(function (require) {
bdd.it('should show correct data for chart interval Daily', function () {
var chartInterval = 'Daily';
var expectedBarChartData = [
'0', '133.196', '129.192', '129.724', '0'
'133.196', '129.192', '129.724'
];
return discoverPage.setChartInterval(chartInterval)
.then(function () {
Expand Down Expand Up @@ -223,12 +220,11 @@ define(function (require) {

bdd.it('should show correct data for chart interval Auto', function () {
var chartInterval = 'Auto';
var expectedBarChartData = [ '0', '0', '0', '0', '0', '0', '3.237',
var expectedBarChartData = [ '3.237',
'17.674', '64.75', '125.737', '119.962', '65.712', '16.449',
'2.712', '3.675', '17.674', '59.762', '119.087', '123.812',
'61.862', '15.487', '2.362', '2.800', '15.312', '61.862', '123.2',
'118.562', '63.524', '17.587', '2.537', '0', '0', '0', '0', '0',
'0', '0'
'118.562', '63.524', '17.587', '2.537'
];
return discoverPage.setChartInterval(chartInterval)
.then(function () {
Expand Down