Adding timeshift units

dist/datasource.js

@@ -221,9 +221,10 @@ function (angular, _, dateMath, moment) {
         var periodsToShift = target.periods;
         var query = target.query;
         var metric = target.metric;
+        var timeshiftUnit = target.timeshiftUnit;
 
-        options.range.from._d = dateToMoment(options.range.from, false).add(periodsToShift,'days').toDate();
-        options.range.to._d = dateToMoment(options.range.to, false).add(periodsToShift,'days').toDate();
+        options.range.from._d = dateToMoment(options.range.from, false).add(periodsToShift,timeshiftUnit).toDate();
+        options.range.to._d = dateToMoment(options.range.to, false).add(periodsToShift,timeshiftUnit).toDate();
 
         var metaTarget = angular.copy(targetsByRefId[query]);
         metaTarget.hide = false;
@@ -248,7 +249,7 @@ function (angular, _, dateMath, moment) {
               data.forEach(function (datum) {
                   if(datum.target===metric){
                     datum.datapoints.forEach(function (datapoint) {
-                        datapoint[1] = dateToMoment(new Date(datapoint[1]),false).subtract(periodsToShift,'days').toDate().getTime();
+                        datapoint[1] = dateToMoment(new Date(datapoint[1]),false).subtract(periodsToShift,timeshiftUnit).toDate().getTime();
                         datapoints.push(datapoint)
                     })
                   }

dist/partials/query.editor.html

@@ -28,7 +28,7 @@
   </div>
 
   <div class="gf-form-inline" ng-switch on="ctrl.target.queryType">
-    <div ng-switch-when="MovingAverage|TimeShift" ng-switch-when-separator="|" class="gf-form max-width-20">
+    <div ng-switch-when="MovingAverage" ng-switch-when-separator="|" class="gf-form max-width-20">
       <label class="gf-form-label query-keyword width-9">
         Periods
       </label>
@@ -37,6 +37,27 @@
         <i class="fa fa-warning"></i>
       </label>
     </div>
+    <div ng-switch-when="TimeShift" ng-switch-when-separator="|" class="gf-form max-width-20">
+      <label class="gf-form-label query-keyword width-9">
+        Periods
+      </label>
+      <input type="text" class="gf-form-input" ng-model="ctrl.target.periods" spellcheck='false' placeholder="7" ng-blur="ctrl.targetBlur()" />
+      <label class="gf-form-label" bs-tooltip="ctrl.target.errors.periods" style="color: rgb(229, 189, 28)" ng-show="ctrl.target.errors.periods">
+        <i class="fa fa-warning"></i>
+      </label>
+    </div>
+    <div ng-switch-when="TimeShift" ng-switch-when-separator="|" class="gf-form max-width-20">
+      <label class="gf-form-label query-keyword width-9">
+        Unit
+      </label>
+      <div class="gf-form-select-wrapper max-width-15">
+        <select ng-model="ctrl.target.timeshiftUnit" class="gf-form-input" ng-options="timeshiftUnit for timeshiftUnit in ['seconds', 'minutes', 'hours', 'days', 'weeks', 'months']" ng-change="ctrl.targetBlur()">
+        </select>
+      </div>
+      <label class="gf-form-label" bs-tooltip="ctrl.target.errors.timeshiftUnit" style="color: rgb(229, 189, 28)" ng-show="ctrl.target.errors.timeshiftUnit">
+        <i class="fa fa-warning"></i>
+      </label>
+    </div>
     <div ng-switch-when="MovingAverage|TimeShift" ng-switch-when-separator="|" class="gf-form">
       <label class="gf-form-label query-keyword width-4">
         Query

dist/plugin.json

@@ -8,9 +8,9 @@
   "hiddenQueries": true,
 
   "queryOptions": {
-	    "minInterval": true
-	  },
-	
+    "minInterval": true
+  },
+
   "info": {
     "version": "0.0.2",
     "author": {

dist/query_ctrl.d.ts

@@ -30,6 +30,7 @@ export declare class MetaQueriesQueryCtrl extends QueryCtrl {
     };
     defaultQueryType: string;
     defaultPeriods: number;
+    defaultTimeshiftUnit: string;
     /** @ngInject **/
     constructor($scope: any, $injector: any, $q: any);
     targetBlur(): void;

dist/query_ctrl.ts

@@ -38,6 +38,8 @@ export class MetaQueriesQueryCtrl extends QueryCtrl {
 
     defaultPeriods = 7;
 
+    defaultTimeshiftUnit = "days";
+
   /** @ngInject **/
   constructor($scope, $injector, $q) {
     super($scope, $injector);
@@ -52,6 +54,9 @@ export class MetaQueriesQueryCtrl extends QueryCtrl {
       if (!this.target.periods) {
         this.clearPeriods();
       }
+      if (!this.target.timeshiftUnit) {
+        this.target.timeshiftUnit = this.defaultTimeshiftUnit;
+      }
 
     this.getQueryLetters = (query, callback) => {
       return this.datasource.getTargets()

dist/test/query_ctrl.d.ts

@@ -30,6 +30,7 @@ export declare class MetaQueriesQueryCtrl extends QueryCtrl {
     };
     defaultQueryType: string;
     defaultPeriods: number;
+    defaultTimeshiftUnit: string;
     /** @ngInject **/
     constructor($scope: any, $injector: any, $q: any);
     targetBlur(): void;