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

add variable $intervalSecond

Browse Source
This commit is contained in:
Mekal Zheng
2017-01-07 00:12:23 +08:00
parent 53fbb8b074
commit af798092b7
1 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
public/app/plugins/datasource/elasticsearch/datasource.js
View File

@@ -219,6 +219,38 @@ function (angular, _, moment, kbn, ElasticQueryBuilder, IndexPattern, ElasticRes
return $q.when([]);
}
// convert interval string to milliseconds
var intervalToSecond = function (intervalString) {
if (!intervalString) {
return 1;
} else {
var interval = parseInt(intervalString);
if (isNaN(interval)) {
return 1;
} else {
var lastIndex = intervalString.length - 1;
var unit = intervalString.slice(lastIndex);
var scale = 1;
switch (unit) {
case 'd':
scale = 86400;
break;
case 'h':
scale = 3600;
break;
case 'm':
scale = 60;
break;
default:
scale = 1;
}
return interval * scale;
}
}
};
// intervalSecond: interval in seconds
payload = payload.replace(/\$intervalSecond/g, intervalToSecond(options.interval));
payload = payload.replace(/\$interval/g, options.interval);
payload = payload.replace(/\$timeFrom/g, options.range.from.valueOf());
payload = payload.replace(/\$timeTo/g, options.range.to.valueOf());