fix prometheus time conversion

pull/2871/head
Mitsuhiro Tanda 10 years ago
parent 5e34823e7c
commit 5e19fdb492
  1. 6
      public/app/plugins/datasource/prometheus/datasource.js

@ -271,12 +271,6 @@ function (angular, _, moment, dateMath) {
function getPrometheusTime(date, roundUp) {
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);
}
return (date.valueOf() / 1000).toFixed(0);

Loading…
Cancel
Save