fix(influxdb_08): fixed influxdb 08 query editor issue, fixes #3009

public/app/plugins/datasource/influxdb_08/datasource.js

@@ -2,11 +2,11 @@ define([
   'angular',
   'lodash',
   'app/core/utils/datemath',
-  './influxSeries',
-  './queryBuilder',
+  './influx_series',
+  './query_builder',
   './directives',
-  './queryCtrl',
-  './funcEditor',
+  './query_ctrl',
+  './func_editor',
 ],
 function (angular, _, dateMath, InfluxSeries, InfluxQueryBuilder) {
   'use strict';

public/app/plugins/datasource/influxdb_08/queryCtrl.js → public/app/plugins/datasource/influxdb_08/query_ctrl.js

@@ -89,6 +89,7 @@ function (angular) {
       }
     };
 
-  });
+    $scope.init();
 
+  });
 });

public/test/specs/influxdb-datasource-specs.js → public/app/plugins/datasource/influxdb_08/specs/datasource-specs.ts

-define([
-  './helpers',
-  'app/plugins/datasource/influxdb_08/datasource',
-  'app/services/backendSrv',
-  'app/services/alertSrv'
-], function(helpers) {
-  'use strict';
-
-  describe('InfluxDatasource', function() {
-    var ctx = new helpers.ServiceTestContext();
-
-    beforeEach(module('grafana.services'));
-    beforeEach(ctx.providePhase(['templateSrv']));
-    beforeEach(ctx.createService('InfluxDatasource_08'));
-    beforeEach(function() {
-      ctx.ds = new ctx.service({ url: '', user: 'test', password: 'mupp' });
-    });
+///<amd-dependency path="app/plugins/datasource/influxdb_08/datasource"/>
+///<amd-dependency path="app/services/backendSrv"/>
+///<amd-dependency path="app/services/alertSrv"/>
+///<amd-dependency path="test/specs/helpers" name="helpers" />
 
-    describe('When querying influxdb with one target using query editor target spec', function() {
-      var results;
-      var urlExpected = "/series?p=mupp&q=select+mean(value)+from+%22test%22"+
-                        "+where+time+%3E+now()-1h+group+by+time(1s)+order+asc";
-      var query = {
-        rangeRaw: { from: 'now-1h', to: 'now' },
-        targets: [{ series: 'test', column: 'value', function: 'mean' }],
-        interval: '1s'
-      };
+import {describe, beforeEach, it, sinon, expect, angularMocks} from 'test/lib/common';
 
-      var response = [{
-        columns: ["time", "sequence_nr", "value"],
-        name: 'test',
-        points: [[10, 1, 1]],
-      }];
+declare var helpers: any;
 
-      beforeEach(function() {
-        ctx.$httpBackend.expect('GET', urlExpected).respond(response);
-        ctx.ds.query(query).then(function(data) { results = data; });
-        ctx.$httpBackend.flush();
-      });
+describe('InfluxDatasource', function() {
+  var ctx = new helpers.ServiceTestContext();
+
+  beforeEach(angularMocks.module('grafana.services'));
+  beforeEach(ctx.providePhase(['templateSrv']));
+  beforeEach(ctx.createService('InfluxDatasource_08'));
+  beforeEach(function() {
+    ctx.ds = new ctx.service({ url: '', user: 'test', password: 'mupp' });
+  });
 
-      it('should generate the correct query', function() {
-        ctx.$httpBackend.verifyNoOutstandingExpectation();
-      });
+  describe('When querying influxdb with one target using query editor target spec', function() {
+    var results;
+    var urlExpected = "/series?p=mupp&q=select+mean(value)+from+%22test%22+where+time+%3E+now()-1h+group+by+time(1s)+order+asc";
+    var query = {
+      rangeRaw: { from: 'now-1h', to: 'now' },
+      targets: [{ series: 'test', column: 'value', function: 'mean' }],
+      interval: '1s'
+    };
+
+    var response = [{
+      columns: ["time", "sequence_nr", "value"],
+      name: 'test',
+      points: [[10, 1, 1]],
+    }];
 
-      it('should return series list', function() {
-        expect(results.data.length).to.be(1);
-        expect(results.data[0].target).to.be('test.value');
-      });
+    beforeEach(function() {
+      ctx.$httpBackend.expect('GET', urlExpected).respond(response);
+      ctx.ds.query(query).then(function(data) { results = data; });
+      ctx.$httpBackend.flush();
+    });
 
+    it('should generate the correct query', function() {
+      ctx.$httpBackend.verifyNoOutstandingExpectation();
     });
 
-    describe('When querying influxdb with one raw query', function() {
-      var results;
-      var urlExpected = "/series?p=mupp&q=select+value+from+series"+
-                        "+where+time+%3E+now()-1h";
-      var query = {
-        rangeRaw: { from: 'now-1h', to: 'now' },
-        targets: [{ query: "select value from series where $timeFilter", rawQuery: true }]
-      };
+    it('should return series list', function() {
+      expect(results.data.length).to.be(1);
+      expect(results.data[0].target).to.be('test.value');
+    });
 
-      var response = [];
+  });
 
-      beforeEach(function() {
-        ctx.$httpBackend.expect('GET', urlExpected).respond(response);
-        ctx.ds.query(query).then(function(data) { results = data; });
-        ctx.$httpBackend.flush();
-      });
+  describe('When querying influxdb with one raw query', function() {
+    var results;
+    var urlExpected = "/series?p=mupp&q=select+value+from+series+where+time+%3E+now()-1h";
+    var query = {
+      rangeRaw: { from: 'now-1h', to: 'now' },
+      targets: [{ query: "select value from series where $timeFilter", rawQuery: true }]
+    };
 
-      it('should generate the correct query', function() {
-        ctx.$httpBackend.verifyNoOutstandingExpectation();
-      });
+    var response = [];
 
+    beforeEach(function() {
+      ctx.$httpBackend.expect('GET', urlExpected).respond(response);
+      ctx.ds.query(query).then(function(data) { results = data; });
+      ctx.$httpBackend.flush();
     });
 
-    describe('When issuing annotation query', function() {
-      var results;
-      var urlExpected = "/series?p=mupp&q=select+title+from+events.backend_01"+
-                        "+where+time+%3E+now()-1h";
+    it('should generate the correct query', function() {
+      ctx.$httpBackend.verifyNoOutstandingExpectation();
+    });
 
-      var range = { from: 'now-1h', to: 'now' };
-      var annotation = { query: 'select title from events.$server where $timeFilter' };
-      var response = [];
+  });
 
-      beforeEach(function() {
-        ctx.templateSrv.replace = function(str) {
-          return str.replace('$server', 'backend_01');
-        };
-        ctx.$httpBackend.expect('GET', urlExpected).respond(response);
-        ctx.ds.annotationQuery(annotation, range).then(function(data) { results = data; });
-        ctx.$httpBackend.flush();
-      });
+  describe('When issuing annotation query', function() {
+    var results;
+    var urlExpected = "/series?p=mupp&q=select+title+from+events.backend_01+where+time+%3E+now()-1h";
 
-      it('should generate the correct query', function() {
-        ctx.$httpBackend.verifyNoOutstandingExpectation();
-      });
+    var range = { from: 'now-1h', to: 'now' };
+    var annotation = { query: 'select title from events.$server where $timeFilter' };
+    var response = [];
 
+    beforeEach(function() {
+      ctx.templateSrv.replace = function(str) {
+        return str.replace('$server', 'backend_01');
+      };
+      ctx.$httpBackend.expect('GET', urlExpected).respond(response);
+      ctx.ds.annotationQuery(annotation, range).then(function(data) { results = data; });
+      ctx.$httpBackend.flush();
+    });
+
+    it('should generate the correct query', function() {
+      ctx.$httpBackend.verifyNoOutstandingExpectation();
     });
 
   });
-});
 
+});

public/test/specs/influxQueryBuilder-specs.js → public/app/plugins/datasource/influxdb_08/specs/query_builder_specs.ts

-define([
-  'app/plugins/datasource/influxdb_08/queryBuilder'
-], function(InfluxQueryBuilder) {
-  'use strict';
+///<amd-dependency path="app/plugins/datasource/influxdb_08/query_builder" name="InfluxQueryBuilder"/>
 
-  describe('InfluxQueryBuilder', function() {
+import {describe, beforeEach, it, sinon, expect} from 'test/lib/common';
 
-    describe('series with conditon and group by', function() {
-      var builder = new InfluxQueryBuilder({
-        series: 'google.test',
-        column: 'value',
-        function: 'mean',
-        condition: "code=1",
-        groupby_field: 'code'
-      });
+declare var InfluxQueryBuilder: any;
 
-      var query = builder.build();
+describe('InfluxQueryBuilder', function() {
 
-      it('should generate correct query', function() {
-        expect(query).to.be('select code, mean(value) from "google.test" where $timeFilter and code=1 ' +
-          'group by time($interval), code order asc');
-      });
+  describe('series with conditon and group by', function() {
+    var builder = new InfluxQueryBuilder({
+      series: 'google.test',
+      column: 'value',
+      function: 'mean',
+      condition: "code=1",
+      groupby_field: 'code'
+    });
 
-      it('should expose groupByFiled', function() {
-        expect(builder.groupByField).to.be('code');
-      });
+    var query = builder.build();
 
+    it('should generate correct query', function() {
+      expect(query).to.be('select code, mean(value) from "google.test" where $timeFilter and code=1 ' +
+                          'group by time($interval), code order asc');
     });
 
-    describe('series with fill and minimum group by time', function() {
-      var builder = new InfluxQueryBuilder({
-        series: 'google.test',
-        column: 'value',
-        function: 'mean',
-        fill: '0',
-      });
-
-      var query = builder.build();
+    it('should expose groupByFiled', function() {
+      expect(builder.groupByField).to.be('code');
+    });
 
-      it('should generate correct query', function() {
-        expect(query).to.be('select mean(value) from "google.test" where $timeFilter ' +
-          'group by time($interval) fill(0) order asc');
-      });
+  });
 
+  describe('series with fill and minimum group by time', function() {
+    var builder = new InfluxQueryBuilder({
+      series: 'google.test',
+      column: 'value',
+      function: 'mean',
+      fill: '0',
     });
 
-    describe('merge function detection', function() {
-      it('should not quote wrap regex merged series', function() {
-        var builder = new InfluxQueryBuilder({
-          series: 'merge(/^google.test/)',
-          column: 'value',
-          function: 'mean'
-        });
+    var query = builder.build();
+
+    it('should generate correct query', function() {
+      expect(query).to.be('select mean(value) from "google.test" where $timeFilter ' +
+                          'group by time($interval) fill(0) order asc');
+    });
 
-        var query = builder.build();
+  });
 
-        expect(query).to.be('select mean(value) from merge(/^google.test/) where $timeFilter ' +
-          'group by time($interval) order asc');
+  describe('merge function detection', function() {
+    it('should not quote wrap regex merged series', function() {
+      var builder = new InfluxQueryBuilder({
+        series: 'merge(/^google.test/)',
+        column: 'value',
+        function: 'mean'
       });
 
-      it('should quote wrap series names that start with "merge"', function() {
-        var builder = new InfluxQueryBuilder({
-          series: 'merge.google.test',
-          column: 'value',
-          function: 'mean'
-        });
+      var query = builder.build();
 
-        var query = builder.build();
+      expect(query).to.be('select mean(value) from merge(/^google.test/) where $timeFilter ' +
+                          'group by time($interval) order asc');
+    });
 
-        expect(query).to.be('select mean(value) from "merge.google.test" where $timeFilter ' +
-          'group by time($interval) order asc');
+    it('should quote wrap series names that start with "merge"', function() {
+      var builder = new InfluxQueryBuilder({
+        series: 'merge.google.test',
+        column: 'value',
+        function: 'mean'
       });
 
+      var query = builder.build();
+
+      expect(query).to.be('select mean(value) from "merge.google.test" where $timeFilter ' +
+                          'group by time($interval) order asc');
     });
 
   });
 
 });
+