From 771cd8bfbe1f909964505d22962a43a8baea98c0 Mon Sep 17 00:00:00 2001
From: liu0x54 <tliu@taosdata.com>
Date: Thu, 12 Mar 2020 22:46:31 +0800
Subject: [PATCH] github issue number #1361

---
 src/connector/grafana/tdengine/dist/datasource.js | 6 ++++--
 src/connector/grafana/tdengine/src/datasource.js  | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/connector/grafana/tdengine/dist/datasource.js b/src/connector/grafana/tdengine/dist/datasource.js
index 8190394f93..73ba969b82 100644
--- a/src/connector/grafana/tdengine/dist/datasource.js
+++ b/src/connector/grafana/tdengine/dist/datasource.js
@@ -136,8 +136,10 @@ var GenericDatasource = exports.GenericDatasource = function () {
       if (options != null && options.range != null && options.range.to != null) {
         queryEnd = options.range.to.toISOString();
       }
-      var intervalMs = options.intervalMs || "20000";
-
+      var intervalMs = Math.max(options.intervalMs,15000);
+      if (isNaN(intervalMs)) {
+        intervalMs = 15000;
+      }
       intervalMs += "a";
       sql = sql.replace(/^\s+|\s+$/gm, '');
       sql = sql.replace("$from", "'" + queryStart + "'");
diff --git a/src/connector/grafana/tdengine/src/datasource.js b/src/connector/grafana/tdengine/src/datasource.js
index 08426bb3df..3963849dd9 100644
--- a/src/connector/grafana/tdengine/src/datasource.js
+++ b/src/connector/grafana/tdengine/src/datasource.js
@@ -110,8 +110,10 @@ export class GenericDatasource {
     if (options != null && options.range != null && options.range.to != null){
       queryEnd = options.range.to.toISOString();
     }
-    var intervalMs = options.intervalMs || "20000";
-
+    var intervalMs = Math.max(options.intervalMs,15000);
+    if (isNaN(intervalMs)) {
+      intervalMs = 15000;
+    }
     intervalMs += "a";
     sql = sql.replace(/^\s+|\s+$/gm, '');
     sql = sql.replace("$from", "'" + queryStart + "'");
-- 
GitLab