IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-14 01:23:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

check validation of interval string before converting to seconds

Browse Source
This commit is contained in:
Mekal Zheng 2017-01-07 18:17:44 +08:00
parent 333aeb43c4
commit e57c764410
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -220,8 +220,10 @@ function (angular, _, moment, kbn, ElasticQueryBuilder, IndexPattern, ElasticRes
}
// intervalSec: interval in seconds
payload = payload.replace(/\$intervalSec/g, kbn.interval_to_seconds(options.interval));
payload = payload.replace(/\$intervalMs/g, kbn.interval_to_ms(options.interval));
if (options.interval && options.interval.match(kbn.interval_regex)) {
payload = payload.replace(/\$intervalSec/g, kbn.interval_to_seconds(options.interval));
payload = payload.replace(/\$intervalMs/g, kbn.interval_to_ms(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());