make it more smartly

public/app/core/utils/kbn.js

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

public/app/features/templating/templateValuesSrv.js

@@ -60,7 +60,7 @@ function (angular, _, kbn) {
         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);
     };