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

make it more smartly

Browse Source
This commit is contained in:
benrubson 2016-02-22 10:27:08 +01:00
parent b9843fe6d1
commit c9fe2bab60
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/app/core/utils/kbn.js
View File

@ -119,14 +119,10 @@ function($, _) {
s: 1 s: 1
}; };
kbn.calculateInterval = function(range, resolution, userInterval, lowLimit) { kbn.calculateInterval = function(range, resolution, userInterval) {
var lowLimitMs = 1; // 1 millisecond default low limit var lowLimitMs = 1; // 1 millisecond default low limit
var intervalMs, lowLimitInterval; var intervalMs, lowLimitInterval;
if (lowLimit) {
lowLimitMs = kbn.interval_to_ms(lowLimit);
}
if (userInterval) { if (userInterval) {
if (userInterval[0] === '>') { if (userInterval[0] === '>') {
lowLimitInterval = userInterval.slice(1); lowLimitInterval = userInterval.slice(1);

2
public/app/features/templating/templateValuesSrv.js
View File

@ -60,7 +60,7 @@ function (angular, _, kbn) {
variable.options.unshift({ text: 'auto', value: '$__auto_interval' }); variable.options.unshift({ text: 'auto', value: '$__auto_interval' });
} }
var interval = kbn.calculateInterval(timeSrv.timeRange(), variable.auto_count, null, variable.auto_min); var interval = kbn.calculateInterval(timeSrv.timeRange(), variable.auto_count, (variable.auto_min ? ">"+variable.auto_min : null));
templateSrv.setGrafanaVariable('$__auto_interval', interval); templateSrv.setGrafanaVariable('$__auto_interval', interval);
}; };