allow rounding with round option both time filters: $from and $to

Altinity · Dec 13, 2017 · 7ca293a · 7ca293a
1 parent 7cf5cf3
commit 7ca293a
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 1.2.6 (2017-12-13)
+
+# Fixes
+* allow rounding with `round` option both time filters: $from and $to
+
+
 # 1.2.5 (2017-12-05)
 
 # Fixes

diff --git a/dist/sql_query.js b/dist/sql_query.js
diff --git a/dist/sql_query.js.map b/dist/sql_query.js.map
diff --git a/dist/sql_query.ts b/dist/sql_query.ts
@@ -24,14 +24,14 @@ export default class SqlQuery {
             scanner = new Scanner(query),
             dateTimeType = this.target.dateTimeType ? this.target.dateTimeType : 'DATETIME',
             from = SqlQuery.convertTimestamp(SqlQuery.round(this.options.range.from, this.target.round)),
-            to = SqlQuery.convertTimestamp(this.options.range.to),
+            to = SqlQuery.convertTimestamp(SqlQuery.round(this.options.range.to, this.target.round)),
             timeSeries = SqlQuery.getTimeSeries(dateTimeType),
             timeFilter = SqlQuery.getTimeFilter(this.options.rangeRaw.to === 'now', dateTimeType),
             i = this.templateSrv.replace(this.target.interval, options.scopedVars) || options.interval,
             interval = SqlQuery.convertInterval(i, this.target.intervalFactor || 1);
 
         try {
-            var ast = scanner.toAST();
+            let ast = scanner.toAST();
             if (ast.hasOwnProperty('$columns') && !_.isEmpty(ast['$columns'])) {
                 query = SqlQuery.columns(query);
             } else if (ast.hasOwnProperty('$rateColumns') && !_.isEmpty(ast['$rateColumns'])) {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "vertamedia-clickhouse",
-    "version": "1.2.5",
+    "version": "1.2.6",
     "description": "ClickHouse datasource for Grafana",
     "scripts": {
         "build": "grunt",

diff --git a/src/plugin.json b/src/plugin.json
@@ -24,6 +24,6 @@
         "url": "https://github.com/Vertamedia/clickhouse-grafana"
       }
     ],
-    "version": "1.2.5"
+    "version": "1.2.6"
   }
 }
diff --git a/src/sql_query.ts b/src/sql_query.ts
@@ -24,14 +24,14 @@ export default class SqlQuery {
             scanner = new Scanner(query),
             dateTimeType = this.target.dateTimeType ? this.target.dateTimeType : 'DATETIME',
             from = SqlQuery.convertTimestamp(SqlQuery.round(this.options.range.from, this.target.round)),
-            to = SqlQuery.convertTimestamp(this.options.range.to),
+            to = SqlQuery.convertTimestamp(SqlQuery.round(this.options.range.to, this.target.round)),
             timeSeries = SqlQuery.getTimeSeries(dateTimeType),
             timeFilter = SqlQuery.getTimeFilter(this.options.rangeRaw.to === 'now', dateTimeType),
             i = this.templateSrv.replace(this.target.interval, options.scopedVars) || options.interval,
             interval = SqlQuery.convertInterval(i, this.target.intervalFactor || 1);
 
         try {
-            var ast = scanner.toAST();
+            let ast = scanner.toAST();
             if (ast.hasOwnProperty('$columns') && !_.isEmpty(ast['$columns'])) {
                 query = SqlQuery.columns(query);
             } else if (ast.hasOwnProperty('$rateColumns') && !_.isEmpty(ast['$rateColumns'])) {