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

Merge pull request #2871 from mtanda/prometheus_time_fix

Browse Source 
fix prometheus time conversion
This commit is contained in:
Torkel Ödegaard 2015-10-03 12:50:05 +02:00
commit 0db2d07a1a
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/app/plugins/datasource/prometheus/datasource.js
View File

@ -271,12 +271,6 @@ function (angular, _, moment, dateMath) {
function getPrometheusTime(date, roundUp) { function getPrometheusTime(date, roundUp) {
if (_.isString(date)) { if (_.isString(date)) {
if (date === 'now') {
return 'now()';
}
if (date.indexOf('now-') >= 0 && date.indexOf('/') === -1) {
return date.replace('now', 'now()').replace('-', ' - ');
}
date = dateMath.parse(date, roundUp); date = dateMath.parse(date, roundUp);
} }
return (date.valueOf() / 1000).toFixed(0); return (date.valueOf() / 1000).toFixed(0);