Merge branch 'develop' into overview

Conflicts:
	src/test/test-main.js

.gitignore

@@ -1,4 +1,5 @@
 node_modules
+coverage/
 .aws-config.json
 dist
 

.travis.yml

@@ -2,4 +2,6 @@ language: node_js
 node_js:
   - "0.10"
 before_script:
-  - npm install -g grunt-cli
+  - npm install -g grunt-cli
+after_script:
+  - npm run coveralls

package.json

@@ -36,6 +36,8 @@
     "karma": "~0.12.16",
     "karma-chrome-launcher": "~0.1.4",
     "karma-coffee-preprocessor": "~0.1.2",
+    "karma-coverage": "^0.2.5",
+    "karma-coveralls": "^0.1.4",
     "karma-expect": "~1.1.0",
     "karma-firefox-launcher": "~0.1.3",
     "karma-html2js-preprocessor": "~0.1.0",
@@ -54,7 +56,8 @@
     "npm": "1.2.x"
   },
   "scripts": {
-    "test": "grunt test"
+    "test": "grunt test",
+    "coveralls": "grunt karma:coveralls && rm -rf ./coverage"
   },
   "license": "Apache License",
   "dependencies": {

src/app/app.js

@@ -4,7 +4,7 @@
 define([
   'angular',
   'jquery',
-  'underscore',
+  'lodash',
   'require',
   'config',
   'bootstrap',

src/app/components/kbn.js

@@ -1,4 +1,4 @@
-define(['jquery','underscore','moment'],
+define(['jquery','lodash','moment'],
 function($, _, moment) {
   'use strict';
 

src/app/components/lodash.extended.js

@@ -1,5 +1,5 @@
 define([
-  'underscore-src'
+  'lodash-src'
 ],
 function () {
   'use strict';

src/app/components/require.config.js

@@ -23,8 +23,8 @@ require.config({
     crypto:                   '../vendor/crypto.min',
     spectrum:                 '../vendor/spectrum',
 
-    underscore:               'components/underscore.extended',
-    'underscore-src':         '../vendor/underscore',
+    lodash:                   'components/lodash.extended',
+    'lodash-src':             '../vendor/lodash',
     bootstrap:                '../vendor/bootstrap/bootstrap',
 
     jquery:                   '../vendor/jquery/jquery-1.8.0',
@@ -46,9 +46,6 @@ require.config({
 
   },
   shim: {
-    underscore: {
-      exports: '_'
-    },
 
     spectrum: {
       deps: ['jquery']

src/app/components/settings.js

@@ -1,5 +1,5 @@
 define([
-  'underscore',
+  'lodash',
   'crypto',
 ],
 function (_, crypto) {

src/app/controllers/dash.js

@@ -2,7 +2,7 @@ define([
   'angular',
   'jquery',
   'config',
-  'underscore',
+  'lodash',
   'services/all',
 ],
 function (angular, $, config, _) {
@@ -11,7 +11,7 @@ function (angular, $, config, _) {
   var module = angular.module('grafana.controllers');
 
   module.controller('DashCtrl', function(
-    $scope, $rootScope, dashboardKeybindings, filterSrv, dashboard, panelMoveSrv, timer) {
+    $scope, $rootScope, dashboardKeybindings, filterSrv, dashboardSrv, panelMoveSrv, timer) {
 
     $scope.editor = { index: 0 };
     $scope.panelNames = config.panels;
@@ -26,7 +26,7 @@ function (angular, $, config, _) {
 
       $rootScope.fullscreen = false;
 
-      $scope.dashboard = dashboard.create(dashboardData);
+      $scope.dashboard = dashboardSrv.create(dashboardData);
       $scope.grafana.style = $scope.dashboard.style;
 
       $scope.filter = filterSrv;

src/app/controllers/dashLoader.js

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore',
+  'lodash',
   'moment',
   'config',
   'filesaver'

src/app/controllers/grafanaCtrl.js

@@ -1,7 +1,7 @@
 define([
   'angular',
   'config',
-  'underscore',
+  'lodash',
 ],
 function (angular, config, _) {
   "use strict";

src/app/controllers/graphiteImport.js

@@ -1,7 +1,7 @@
 define([
   'angular',
   'app',
-  'underscore'
+  'lodash'
 ],
 function (angular, app, _) {
   'use strict';

src/app/controllers/graphiteTarget.js

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore',
+  'lodash',
   'config',
   '../services/graphite/gfunc',
   '../services/graphite/parser'

src/app/controllers/metricKeys.js

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore',
+  'lodash',
   'config'
 ],
 function (angular, _, config) {

src/app/controllers/opentsdbTargetCtrl.js

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore',
+  'lodash',
   'kbn'
 ],
 function (angular, _, kbn) {

src/app/controllers/playlistCtrl.js

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore',
+  'lodash',
   'config'
 ],
 function (angular, _, config) {

src/app/controllers/pulldown.js

@@ -1,7 +1,7 @@
 define([
   'angular',
   'app',
-  'underscore'
+  'lodash'
 ],
 function (angular, app, _) {
   'use strict';

src/app/controllers/row.js

@@ -1,7 +1,7 @@
 define([
   'angular',
   'app',
-  'underscore'
+  'lodash'
 ],
 function (angular, app, _) {
   'use strict';

src/app/controllers/search.js

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore',
+  'lodash',
   'config',
   'jquery'
 ],

src/app/controllers/submenuCtrl.js

@@ -1,7 +1,7 @@
 define([
   'angular',
   'app',
-  'underscore'
+  'lodash'
 ],
 function (angular, app, _) {
   'use strict';

src/app/directives/addGraphiteFunc.js

@@ -1,7 +1,7 @@
 define([
   'angular',
   'app',
-  'underscore',
+  'lodash',
   'jquery',
   '../services/graphite/gfunc',
 ],

src/app/directives/addPanel.js

@@ -1,7 +1,7 @@
 define([
   'angular',
   'app',
-  'underscore'
+  'lodash'
 ],
 function (angular, app, _) {
   'use strict';

src/app/directives/arrayJoin.js

@@ -1,7 +1,7 @@
 define([
   'angular',
   'app',
-  'underscore'
+  'lodash'
 ],
 function (angular, app, _) {
   'use strict';

src/app/directives/bodyClass.js

@@ -1,7 +1,7 @@
 define([
   'angular',
   'app',
-  'underscore'
+  'lodash'
 ],
 function (angular, app, _) {
   'use strict';

src/app/directives/configModal.js

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore',
+  'lodash',
   'jquery'
 ],
 function (angular, _, $) {

src/app/directives/grafanaGraph.js

@@ -3,7 +3,7 @@ define([
   'jquery',
   'kbn',
   'moment',
-  'underscore'
+  'lodash'
 ],
 function (angular, $, kbn, moment, _) {
   'use strict';

src/app/directives/grafanaPanel.js

@@ -1,7 +1,7 @@
 define([
   'angular',
   'jquery',
-  'underscore',
+  'lodash',
 ],
 function (angular, $) {
   'use strict';

src/app/directives/grafanaSimplePanel.js

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore'
+  'lodash'
 ],
 function (angular, _) {
   'use strict';

src/app/directives/graphiteFuncEditor.js

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore',
+  'lodash',
   'jquery',
 ],
 function (angular, _, $) {

src/app/directives/influxdbFuncEditor.js

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore',
+  'lodash',
   'jquery',
 ],
 function (angular, _, $) {

src/app/filters/all.js

@@ -1,4 +1,4 @@
-define(['angular', 'jquery', 'underscore', 'moment'], function (angular, $, _, moment) {
+define(['angular', 'jquery', 'lodash', 'moment'], function (angular, $, _, moment) {
   'use strict';
 
   var module = angular.module('grafana.filters');

src/app/panels/annotations/editor.js

@@ -4,7 +4,7 @@
 define([
   'angular',
   'app',
-  'underscore'
+  'lodash'
 ],
 function (angular, app, _) {
   'use strict';

src/app/panels/annotations/module.js

@@ -6,7 +6,7 @@
 define([
   'angular',
   'app',
-  'underscore',
+  'lodash',
   './editor'
 ],
 function (angular, app, _) {

src/app/panels/filtering/module.js

@@ -6,7 +6,7 @@
 define([
   'angular',
   'app',
-  'underscore'
+  'lodash'
 ],
 function (angular, app, _) {
   'use strict';

src/app/panels/graph/module.html

@@ -1,4 +1,4 @@
-<div  ng-controller='graph'
+<div  ng-controller='GraphCtrl'
       style="min-height:{{panel.height || row.height}}"
       ng-class="{'panel-fullscreen': fullscreen}">
 

src/app/panels/graph/module.js

@@ -15,10 +15,11 @@ define([
   'angular',
   'app',
   'jquery',
-  'underscore',
+  'lodash',
   'kbn',
   'moment',
   './timeSeries',
+  'services/panelSrv',
   'services/annotationsSrv',
   'services/datasourceSrv',
   'jquery.flot',
@@ -35,7 +36,7 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
   var module = angular.module('grafana.panels.graph', []);
   app.useModule(module);
 
-  module.controller('graph', function($scope, $rootScope, $timeout, panelSrv, annotationsSrv) {
+  module.controller('GraphCtrl', function($scope, $rootScope, $timeout, panelSrv, annotationsSrv) {
 
     $scope.panelMeta = {
       modals : [],
@@ -190,12 +191,14 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
     $scope.init = function() {
       panelSrv.init($scope);
       $scope.hiddenSeries = {};
-      $scope.get_data();
+      if (!$scope.skipDataOnInit) {
+        $scope.get_data();
+      }
     };
 
     $scope.updateTimeRange = function () {
-      $scope.range = this.filter.timeRange();
-      $scope.rangeUnparsed = this.filter.timeRange(false);
+      $scope.range = $scope.filter.timeRange();
+      $scope.rangeUnparsed = $scope.filter.timeRange(false);
       $scope.resolution = Math.ceil($(window).width() * ($scope.panel.span / 12));
       $scope.interval = '10m';
 

src/app/panels/graph/timeSeries.js

@@ -1,5 +1,5 @@
 define([
-  'underscore',
+  'lodash',
   'kbn'
 ],
 function (_, kbn) {

src/app/panels/text/module.js

@@ -13,7 +13,7 @@
 define([
   'angular',
   'app',
-  'underscore',
+  'lodash',
   'require',
   'services/filterSrv'
 ],

src/app/panels/timepicker/module.js

@@ -15,7 +15,7 @@
 define([
   'angular',
   'app',
-  'underscore',
+  'lodash',
   'moment',
   'kbn'
 ],

src/app/routes/dashboard-from-file.js

@@ -2,7 +2,7 @@ define([
   'angular',
   'jquery',
   'config',
-  'underscore'
+  'lodash'
 ],
 function (angular, $, config, _) {
   "use strict";

src/app/routes/dashboard-from-script.js

@@ -2,7 +2,7 @@ define([
   'angular',
   'jquery',
   'config',
-  'underscore',
+  'lodash',
   'kbn',
   'moment'
 ],

src/app/services/alertSrv.js

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore'
+  'lodash'
 ],
 function (angular, _) {
   'use strict';

src/app/services/all.js

@@ -10,6 +10,6 @@ define([
   './playlistSrv',
   './unsavedChangesSrv',
   './dashboard/dashboardKeyBindings',
-  './dashboard/dashboardModel',
+  './dashboard/dashboardSrv',
 ],
 function () {});

src/app/services/annotationsSrv.js

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore',
+  'lodash',
   'moment'
 ], function (angular, _, moment) {
   'use strict';

src/app/services/dashboard/dashboardSrv.js

@@ -2,7 +2,7 @@ define([
   'angular',
   'jquery',
   'kbn',
-  'underscore',
+  'lodash',
   '../timer',
 ],
 function (angular, $, kbn, _) {
@@ -10,7 +10,7 @@ function (angular, $, kbn, _) {
 
   var module = angular.module('grafana.services');
 
-  module.service('dashboard', function(timer, $rootScope, $timeout) {
+  module.service('dashboardSrv', function(timer, $rootScope, $timeout) {
 
     function DashboardModel (data) {
 

src/app/services/datasourceSrv.js

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore',
+  'lodash',
   'config',
   './graphite/graphiteDatasource',
   './influxdb/influxdbDatasource',

src/app/services/elasticsearch/es-datasource.js

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore',
+  'lodash',
   'jquery',
   'config',
   'kbn',

src/app/services/filterSrv.js

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore',
+  'lodash',
   'config',
   'kbn'
 ], function (angular, _, config, kbn) {

src/app/services/graphite/gfunc.js

@@ -1,5 +1,5 @@
 define([
-  'underscore'
+  'lodash'
 ],
 function (_) {
   'use strict';

src/app/services/graphite/graphiteDatasource.js

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore',
+  'lodash',
   'jquery',
   'config',
   'kbn',

src/app/services/graphite/lexer.js

@@ -1,5 +1,5 @@
 define([
-  'underscore'
+  'lodash'
 ], function(_) {
   'use strict';
 

src/app/services/influxdb/influxSeries.js

@@ -1,5 +1,5 @@
 define([
-  'underscore',
+  'lodash',
 ],
 function (_) {
   'use strict';

src/app/services/influxdb/influxdbDatasource.js

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore',
+  'lodash',
   'kbn',
   './influxSeries'
 ],

src/app/services/opentsdb/opentsdbDatasource.js

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore',
+  'lodash',
   'kbn'
 ],
 function (angular, _, kbn) {

src/app/services/panelMove.js

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore'
+  'lodash'
 ],
 function (angular, _) {
   'use strict';

src/app/services/panelSrv.js

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore',
+  'lodash',
   'jquery',
 ],
 function (angular, _, $) {

src/app/services/playlistSrv.js

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore',
+  'lodash',
   'kbn'
 ],
 function (angular, _, kbn) {

src/app/services/timer.js

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore'
+  'lodash'
 ],
 function (angular, _) {
   'use strict';

src/app/services/unsavedChangesSrv.js

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore',
+  'lodash',
   'config',
 ],
 function(angular, _, config) {

src/test/karma.conf.js

@@ -2,17 +2,17 @@ module.exports = function(config) {
   'use strict';
 
   config.set({
-    basePath: '../',
+    basePath: '../../',
 
     frameworks: ['mocha', 'requirejs', 'expect', 'sinon'],
 
     // list of files / patterns to load in the browser
     files: [
-      'test/test-main.js',
-      {pattern: 'app/**/*.js', included: false},
-      {pattern: 'vendor/**/*.js', included: false},
-      {pattern: 'test/**/*.js', included: false},
-      {pattern: '**/*.js', included: false}
+      'src/test/test-main.js',
+      {pattern: 'src/app/**/*.js', included: false},
+      {pattern: 'src/vendor/**/*.js', included: false},
+      {pattern: 'src/test/**/*.js', included: false},
+      {pattern: 'src/**/*.js', included: false}
     ],
 
     // list of files to exclude
@@ -23,8 +23,9 @@ module.exports = function(config) {
     colors: true,
     logLevel: config.LOG_INFO,
     autoWatch: true,
-    browsers: ['Chrome'],
+    browsers: ['PhantomJS'],
     captureTimeout: 60000,
-    singleRun: false,
+    singleRun: true,
+
   });
 };

src/test/specs/dashboardSrv-specs.js

@@ -1,5 +1,5 @@
 define([
-  'services/dashboard/dashboardModel'
+  'services/dashboard/dashboardSrv'
 ], function() {
   'use strict';
 
@@ -8,8 +8,8 @@ define([
 
     beforeEach(module('grafana.services'));
 
-    beforeEach(inject(function(dashboard) {
-      model = dashboard.create({});
+    beforeEach(inject(function(dashboardSrv) {
+      model = dashboardSrv.create({});
     }));
 
     it('should have title', function() {
@@ -30,8 +30,8 @@ define([
 
     beforeEach(module('grafana.services'));
 
-    beforeEach(inject(function(dashboard) {
-      model = dashboard.create({
+    beforeEach(inject(function(dashboardSrv) {
+      model = dashboardSrv.create({
         services: { filter: { time: { from: 'now-1d', to: 'now'}, list: [1] }},
         rows: [
           {

src/test/specs/filterSrv-specs.js

@@ -1,6 +1,6 @@
 define([
   'mocks/dashboard-mock',
-  'underscore',
+  'lodash',
   'services/filterSrv'
 ], function(dashboardMock, _) {
   'use strict';
@@ -10,7 +10,7 @@ define([
     var _dashboard;
 
     beforeEach(module('grafana.services'));
-    beforeEach(module(function(){
+    beforeEach(module(function() {
       _dashboard = dashboardMock.create();
     }));
 

src/test/specs/graph-ctrl-specs.js

@@ -0,0 +1,44 @@
+define([
+  './helpers',
+  'panels/graph/module'
+], function(helpers) {
+  'use strict';
+
+  describe('GraphCtrl', function() {
+    var ctx = new helpers.ControllerTestContext();
+
+    beforeEach(module('grafana.services'));
+    beforeEach(module('grafana.panels.graph'));
+
+    beforeEach(ctx.providePhase());
+    beforeEach(ctx.createControllerPhase('GraphCtrl'));
+
+    describe('get_data with 2 series', function() {
+      beforeEach(function() {
+        ctx.annotationsSrv.getAnnotations = sinon.stub().returns(ctx.$q.when([]));
+        ctx.datasource.query = sinon.stub().returns(ctx.$q.when({
+          data: [
+            { target: 'test.cpu1', datapoints: [[1, 10]]},
+            { target: 'test.cpu2', datapoints: [[1, 10]]}
+          ]
+        }));
+        ctx.scope.render = sinon.spy();
+        ctx.scope.get_data();
+        ctx.scope.$digest();
+      });
+
+      it('should build legend model', function() {
+        expect(ctx.scope.legend[0].alias).to.be('test.cpu1');
+        expect(ctx.scope.legend[1].alias).to.be('test.cpu2');
+      });
+
+      it('should send time series to render', function() {
+        var data = ctx.scope.render.getCall(0).args[0];
+        expect(data.length).to.be(2);
+      });
+
+    });
+  });
+
+});
+

src/test/specs/graph-panel-controller-specs.js

@@ -1,31 +0,0 @@
-/*define([
-  'panels/graphite/module'
-], function() {
-  'use strict';
-
-  describe('Graph panel controller', function() {
-    var _graphPanelCtrl;
-
-    beforeEach(module('grafana.panels.graphite'));
-    beforeEach(module(function($provide){
-      $provide.value('filterSrv',{});
-    }));
-
-    beforeEach(inject(function($controller, $rootScope) {
-      _graphPanelCtrl = $controller('graphite', {
-        $scope: $rootScope.$new()
-      });
-    }));
-
-    describe('init', function() {
-      beforeEach(function() {
-      });
-
-      it('asd', function() {
-
-      });
-    });
-  });
-
-});
-*/

src/test/specs/helpers.js

@@ -1,11 +1,14 @@
 define([
-], function() {
+    'kbn'
+], function(kbn) {
   'use strict';
 
   function ControllerTestContext() {
     var self = this;
 
+    this.timeRange = { from:'now-1h', to: 'now'};
     this.datasource = {};
+    this.annotationsSrv = {};
     this.datasourceSrv = {
       getMetricSources: function() {},
       get: function() { return self.datasource; }
@@ -14,6 +17,7 @@ define([
     this.providePhase = function() {
       return module(function($provide) {
         $provide.value('datasourceSrv', self.datasourceSrv);
+        $provide.value('annotationsSrv', self.annotationsSrv);
       });
     };
 
@@ -22,9 +26,20 @@ define([
         self.scope = $rootScope.$new();
         self.scope.panel = {};
         self.scope.filter = {
-          timeRange: function() {}
+          timeRange: function(parse) {
+            if (!parse) {
+              return self.timeRange;
+            }
+            return {
+              from : kbn.parseDate(self.timeRange.from),
+              to : kbn.parseDate(self.timeRange.to)
+            };
+          }
         };
 
+        self.scope.colors = [];
+        for (var i = 0; i < 50; i++) { self.scope.colors.push('#' + i); }
+
         self.$q = $q;
         self.scope.skipDataOnInit = true;
         self.controller = $controller(controllerName, {

src/test/test-main.js

@@ -1,5 +1,5 @@
 require.config({
-  baseUrl: 'http://localhost:9876/base/app',
+  baseUrl: 'http://localhost:9876/base/src/app',
 
   paths: {
     specs:                 '../test/specs',
@@ -8,8 +8,8 @@ require.config({
     kbn:                   'components/kbn',
 
     settings:              'components/settings',
-    underscore:            'components/underscore.extended',
-    'underscore-src':      '../vendor/underscore',
+    lodash:                'components/lodash.extended',
+    'lodash-src':          '../vendor/lodash',
 
     moment:                '../vendor/moment',
     chromath:              '../vendor/chromath',
@@ -47,10 +47,6 @@ require.config({
   },
 
   shim: {
-    underscore: {
-      exports: '_'
-    },
-
     bootstrap: {
       deps: ['jquery']
     },
@@ -122,11 +118,12 @@ require([
     'specs/parser-specs',
     'specs/gfunc-specs',
     'specs/graphiteTargetCtrl-specs',
+    'specs/graph-ctrl-specs',
     'specs/filterSrv-specs',
     'specs/kbn-format-specs',
-    'specs/dashboardModel-specs',
+    'specs/dashboardSrv-specs',
+    'specs/influxSeries-specs',
     'specs/overview-ctrl-specs',
-    'specs/influxSeries-specs'
   ], function () {
     window.__karma__.start();
   });

tasks/options/karma.js

@@ -3,7 +3,6 @@ module.exports = function(config) {
     dev: {
       configFile: 'src/test/karma.conf.js',
       singleRun: false,
-      browsers: ['PhantomJS']
     },
     debug: {
       configFile: 'src/test/karma.conf.js',
@@ -12,8 +11,17 @@ module.exports = function(config) {
     },
     test: {
       configFile: 'src/test/karma.conf.js',
-      singleRun: true,
-      browsers: ['PhantomJS']
+    },
+    coveralls: {
+      configFile: 'src/test/karma.conf.js',
+      reporters: ['dots','coverage','coveralls'],
+      preprocessors: {
+        'src/app/**/*.js': ['coverage']
+      },
+      coverageReporter: {
+        type: 'lcov',
+        dir: 'coverage/'
+      }
     }
   };
 };