From 333aeb43c43e75184f2b2446f1426cca10f4e5a1 Mon Sep 17 00:00:00 2001
From: Mekal Zheng <mekal.zheng@gmail.com>
Date: Sat, 7 Jan 2017 16:33:40 +0800
Subject: [PATCH] use methods of kbn to convert interval string to both second
 and millisecond

---
 .../datasource/elasticsearch/datasource.js    | 35 ++-----------------
 1 file changed, 3 insertions(+), 32 deletions(-)

diff --git a/public/app/plugins/datasource/elasticsearch/datasource.js b/public/app/plugins/datasource/elasticsearch/datasource.js
index 2f056eb9a2f..db88744862d 100644
--- a/public/app/plugins/datasource/elasticsearch/datasource.js
+++ b/public/app/plugins/datasource/elasticsearch/datasource.js
@@ -219,38 +219,9 @@ 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));
+      // 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));
       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());