Skip to content

histogram: dateformat implementation unification and improments #817

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

Closed
mcuadros wants to merge 1 commit into from
Closed

histogram: dateformat implementation unification and improments #817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 17 additions & 1 deletion src/app/components/kbn.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,22 @@ function($, _, moment) {
return info.sec * info.count;
};

kbn.intervalToDateFormat = function (interval) {
var format = "HH:mm<br>MM-DD";
var _int = kbn.interval_to_seconds(interval);
if(_int >= 2628000) {
format = "YYYY-MM-DD<br>MMMM";
}
else if(_int >= 604800) {
format = 'YYYY-MM-DD<br>Wo [week]';
}
else if(_int >= 86400) {
format = 'YYYY-MM-DD<br>dddd';
}

return format;
};

// This should go away, moment.js can do this
kbn.time_ago = function(string) {
return new Date(new Date().getTime() - (kbn.interval_to_ms(string)));
Expand Down Expand Up @@ -594,4 +610,4 @@ function($, _, moment) {
};

return kbn;
});
});
37 changes: 16 additions & 21 deletions src/app/panels/histogram/module.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,6 +568,18 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
});
};

var timeFormat = function(val, stripHTML) {
var format = kbn.intervalToDateFormat(scope.panel.interval);

if (stripHTML === true) {
format = format.replace(/<(?:.|\n)*?>/gm, ' ');
}

return scope.panel.timezone === 'browser' ?
moment(val).format(format) :
moment.utc(val).format(format);
};

// Function for rendering panel
function render_panel(data) {
// IE doesn't work without this
Expand Down Expand Up @@ -626,7 +638,7 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
mode: "time",
min: _.isUndefined(scope.range.from) ? null : scope.range.from.getTime(),
max: _.isUndefined(scope.range.to) ? null : scope.range.to.getTime(),
timeformat: time_format(scope.panel.interval),
tickFormatter: timeFormat,
label: "Datetime",
ticks: elem.width()/100
},
Expand Down Expand Up @@ -706,24 +718,9 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
}
}

function time_format(interval) {
var _int = kbn.interval_to_seconds(interval);
if(_int >= 2628000) {
return "%Y-%m";
}
if(_int >= 86400) {
return "%Y-%m-%d";
}
if(_int >= 60) {
return "%H:%M<br>%m-%d";
}

return "%H:%M:%S";
}

var $tooltip = $('<div>');
elem.bind("plothover", function (event, pos, item) {
var group, value, timestamp;
var group, value;
if (item) {
if (item.series.info.alias || scope.panel.tooltip.query_as_alias) {
group = '<small style="font-size:0.9em;">' +
Expand All @@ -742,12 +739,10 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
if(scope.panel.y_format === 'short') {
value = kbn.shortFormat(value,2);
}
timestamp = scope.panel.timezone === 'browser' ?
moment(item.datapoint[0]).format('YYYY-MM-DD HH:mm:ss') :
moment.utc(item.datapoint[0]).format('YYYY-MM-DD HH:mm:ss');

$tooltip
.html(
group + value + " @ " + timestamp
group + value + " @ " + timeFormat(item.datapoint[0], true)
)
.place_tt(pos.pageX, pos.pageY);
} else {
Expand Down