Merge pull request #5 from AquaQAnalytics/timezonefix

Fixed c.js time offset in temporal_range

Readme.md

@@ -47,6 +47,9 @@ however there are known bugs with lesser used browsers:
 
 We recommend using the latest version of either Google Chrome or Mozilla Firefox.
 
+#### Time Zones:
+Grafana time ranges have support for UTC time, local browser time or Grafana server time. As kdb+ does not have native time-zone support **all timestamps/datetimes in kdb+ are interpreted as UTC+0**. We recommend dashboards are set to UTC time to avoid confusion.
+
 #### Grafana Service:
 On **Windows** grafana will by default install itself as a service. To view running services, run:
 

dist/datasource.d.ts

@@ -29,6 +29,7 @@ export declare class KDBDatasource {
     interpolateVariable: (value: any, variable: any) => any;
     private buildKdbRequest(target);
     private buildTemporalField(queryDetails);
+    private buildKdbTimestamp(date);
     private buildTemporalRange(range);
     private buildWhereParams(queryWhereList);
     private buildColumnParams(target);

dist/datasource.ts

@@ -9,7 +9,7 @@ import { QueryParam } from "./model/query-param";
 import { QueryDictionary } from "./model/queryDictionary";
 import { ConflationParams } from "./model/conflationParams";
 import { graphFunction } from './model/kdb-request-config';
-import { tabFunction,defaultTimeout } from './model/kdb-request-config';
+import { tabFunction,defaultTimeout,kdbEpoch } from './model/kdb-request-config';
 export class KDBDatasource {
     //This is declaring the types of each member
     id: any;
@@ -146,11 +146,15 @@ export class KDBDatasource {
         };
     };
 
+    private buildKdbTimestamp(date : Date) {
+        return 1000000 * (date.valueOf() - kdbEpoch);
+    }
+
     private buildTemporalRange(range) {
-        let temporalRange: Date[] = [];
+        let temporalRange: number[] = [];
         if (range) {
-            temporalRange.push(new Date(range.from._d));
-            temporalRange.push(new Date(range.to._d));
+            temporalRange.push(this.buildKdbTimestamp(range.from._d));
+            temporalRange.push(this.buildKdbTimestamp(range.to._d));
         }
         return temporalRange;
     };

dist/model/kdb-request-config.d.ts

@@ -1,5 +1,6 @@
 export declare const defaultRowCountLimit: number;
 export declare var defaultTimeout: number;
+export declare const kdbEpoch: number;
 export declare const graphFunction: string;
 export declare const tabFunction: string;
 export declare const argCounter: string;

dist/model/kdb-request-config.ts

@@ -3,6 +3,7 @@
 //The default for the number 
 export const defaultRowCountLimit : number = 10000;
 export var defaultTimeout : number = 5000;
+export const kdbEpoch : number = 946684800000
 
 //Graph response type
 export const graphFunction: string =  '{@[x;y;{`payload`error`success!(();"Error! - ",x;0b)}]}{[dict] \n ' +
@@ -73,6 +74,7 @@ export const graphFunction: string =  '{@[x;y;{`payload`error`success!(();"Error
 ' (dict[`queryParam;`maxRowCount];dict[`queryId]); \n ' +
 ' \n ' +
 ' d:dict`queryParam; \n ' +
+' d[`temporal_range]:`timestamp$d[`temporal_range]; \n ' +
 ' qt:d[`query;`type]; \n ' +
 ' funcparts:enlist[`CAST]!enlist("CAST";"AS";"MIXED LIST"); \n ' +
 ' gr:enlist[`CAST]!enlist("CAST";"AS";"MIXED LIST"); \n ' +
@@ -248,6 +250,7 @@ export const tabFunction: string = '{@[x;y;{`payload`error`success!(();"Error! -
 ' (dict[`queryParam;`maxRowCount];dict[`queryId]); \n ' +
 ' \n ' +
 ' d:dict`queryParam; \n ' +
+' d[`temporal_range]:`timestamp$d[`temporal_range]; \n ' +
 ' qt:d[`query;`type]; \n ' +
 ' funcparts:enlist[`CAST]!enlist("CAST";"AS";"MIXED LIST"); \n ' +
 ' gr:enlist[`CAST]!enlist("CAST";"AS";"MIXED LIST"); \n ' +

dist/model/query-param.d.ts

@@ -4,7 +4,7 @@ export declare class QueryParam {
     column: any[];
     where: string[];
     temporal_field: any;
-    temporal_range: Date[];
+    temporal_range: number[];
     grouping: string[];
     conflation: any;
     query: QueryDictionary;

dist/model/query-param.ts

@@ -6,7 +6,7 @@ export class QueryParam {
     column: any[] = [];
     where: string[] = [];
     temporal_field: any;
-    temporal_range: Date[] = [];
+    temporal_range: number[] = [];
     grouping: string[] = [];
     conflation: any;
     query: QueryDictionary;

dist/plugin.json

@@ -12,7 +12,7 @@
       "small": "img/aquaq_logo.png",
       "large": "img/aquaq_logo.png"
     },
-    "version": "1.0.0"
+    "version": "1.0.1"
   },
   "alerting": true,
   "annotations": false,

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "aquaq-kdb-datasource",
-  "version": "1.0.0",
+  "name": "aquaqanalytics-kdbadaptor-datasource",
+  "version": "1.0.1",
   "description": "Grafana plugin for visualisation of data from kdb+ servers.",
   "scripts": {
     "build": "grunt",

src/datasource.ts

@@ -9,7 +9,7 @@ import { QueryParam } from "./model/query-param";
 import { QueryDictionary } from "./model/queryDictionary";
 import { ConflationParams } from "./model/conflationParams";
 import { graphFunction } from './model/kdb-request-config';
-import { tabFunction,defaultTimeout } from './model/kdb-request-config';
+import { tabFunction,defaultTimeout,kdbEpoch } from './model/kdb-request-config';
 export class KDBDatasource {
     //This is declaring the types of each member
     id: any;
@@ -146,11 +146,15 @@ export class KDBDatasource {
         };
     };
 
+    private buildKdbTimestamp(date : Date) {
+        return 1000000 * (date.valueOf() - kdbEpoch);
+    }
+
     private buildTemporalRange(range) {
-        let temporalRange: Date[] = [];
+        let temporalRange: number[] = [];
         if (range) {
-            temporalRange.push(new Date(range.from._d));
-            temporalRange.push(new Date(range.to._d));
+            temporalRange.push(this.buildKdbTimestamp(range.from._d));
+            temporalRange.push(this.buildKdbTimestamp(range.to._d));
         }
         return temporalRange;
     };

src/model/kdb-request-config.ts

@@ -3,6 +3,7 @@
 //The default for the number 
 export const defaultRowCountLimit : number = 10000;
 export var defaultTimeout : number = 5000;
+export const kdbEpoch : number = 946684800000
 
 //Graph response type
 export const graphFunction: string =  '{@[x;y;{`payload`error`success!(();"Error! - ",x;0b)}]}{[dict] \n ' +
@@ -73,6 +74,7 @@ export const graphFunction: string =  '{@[x;y;{`payload`error`success!(();"Error
 ' (dict[`queryParam;`maxRowCount];dict[`queryId]); \n ' +
 ' \n ' +
 ' d:dict`queryParam; \n ' +
+' d[`temporal_range]:`timestamp$d[`temporal_range]; \n ' +
 ' qt:d[`query;`type]; \n ' +
 ' funcparts:enlist[`CAST]!enlist("CAST";"AS";"MIXED LIST"); \n ' +
 ' gr:enlist[`CAST]!enlist("CAST";"AS";"MIXED LIST"); \n ' +
@@ -248,6 +250,7 @@ export const tabFunction: string = '{@[x;y;{`payload`error`success!(();"Error! -
 ' (dict[`queryParam;`maxRowCount];dict[`queryId]); \n ' +
 ' \n ' +
 ' d:dict`queryParam; \n ' +
+' d[`temporal_range]:`timestamp$d[`temporal_range]; \n ' +
 ' qt:d[`query;`type]; \n ' +
 ' funcparts:enlist[`CAST]!enlist("CAST";"AS";"MIXED LIST"); \n ' +
 ' gr:enlist[`CAST]!enlist("CAST";"AS";"MIXED LIST"); \n ' +