IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

feat(timepicker): added new relative time option , will set time range to midnight to now, closes #1186

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-08-11 19:16:45 +02:00
parent 82feeff3aa
commit fe093c6385
5 changed files with 42 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/app/plugins/datasource/influxdb/datasource.js
View File

@@ -186,7 +186,10 @@ function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) {
function getInfluxTime(date) {
if (_.isString(date)) {
return date.replace('now', 'now()').replace('-', ' - ');
if (date.indexOf('now') >= 0) {
return date.replace('now', 'now()').replace('-', ' - ');
}
date = kbn.parseDate(date);
}
return to_utc_epoch_seconds(date);