build system changes

CHANGELOG.md

@@ -3,6 +3,7 @@ vNext
 - Allow special characters in serie names (influxdb datasource), PR #390 - thx  @majst01
 - Refactoring of filterSrv (Issue #428), thx @Tetha
 - New config for playlist feature. Set playlist_timespan to set default playlist interval (Issue #445) - thx @rmca
+- New InfluxDB function difference add to function dropdown (PR #455)
 
 # Fixes
 - Filter option loading when having muliple nested filters now works better.

package.json

@@ -44,7 +44,11 @@
     "karma-mocha": "~0.1.1",
     "karma-expect": "~1.0.0",
     "grunt-cli": "~0.1.13",
-    "jshint-stylish": "~0.1.5"
+    "jshint-stylish": "~0.1.5",
+    "grunt-contrib-concat": "^0.4.0",
+    "grunt-angular-templates": "^0.5.5",
+    "grunt-usemin": "^2.1.1",
+    "grunt-filerev": "^0.2.1"
   },
   "engines": {
     "node": "0.10.x",
@@ -55,8 +59,6 @@
   },
   "license": "Apache License",
   "dependencies": {
-    "grunt-contrib-concat": "^0.4.0",
-    "grunt-filerev": "^0.2.1",
-    "grunt-usemin": "^2.1.1"
+
   }
 }

src/app/app.js

@@ -98,8 +98,9 @@ function (angular, $, _, appLevelRequire) {
     'pasvaz.bindonce'
   ];
 
-  _.each('controllers directives factories services services.dashboard filters'.split(' '),
-  function (type) {
+  var module_types = ['controllers', 'directives', 'factories', 'services', 'services.dashboard', 'filters'];
+
+  _.each(module_types, function (type) {
     var module_name = 'kibana.'+type;
     // create the module
     app.useModule(angular.module(module_name, []));
@@ -117,7 +118,8 @@ function (angular, $, _, appLevelRequire) {
   require([
     'controllers/all',
     'directives/all',
-    'filters/all'
+    'filters/all',
+    'components/partials',
   ], function () {
 
     // bootstrap the app

src/app/components/partials.js

@@ -0,0 +1,2 @@
+define([
+], function () {});

src/app/controllers/influxTargetCtrl.js

@@ -17,7 +17,10 @@ function (angular) {
 
       $scope.rawQuery = false;
 
-      $scope.functions = ['count', 'mean', 'sum', 'min', 'max', 'mode', 'distinct', 'median', 'derivative', 'stddev', 'first', 'last'];
+      $scope.functions = ['count', 'mean', 'sum', 'min',
+                          'max', 'mode', 'distinct', 'median',
+                          'derivative', 'stddev', 'first', 'last',
+                          'difference'];
       $scope.operators = ['=', '=~', '>', '<', '!~', '<>'];
       $scope.oldSeries = $scope.target.series;
       $scope.$on('typeahead-updated', function(){

tasks/build_task.js

@@ -9,6 +9,7 @@ module.exports = function(grunt) {
     'concat:css',
     'copy:everything_but_less_to_temp',
     'htmlmin:build',
+    'ngtemplates:app',
     'cssmin:build',
     'ngmin:build',
     'requirejs:build',

tasks/options/concat.js

@@ -2,11 +2,11 @@ module.exports = function(config) {
   return {
     css: {
       src: [
-        '<%= srcDir %>/css/normalize.min.css', 
-        '<%= srcDir %>/css/bootstrap.dark.min.css', 
-        '<%= srcDir %>/css/timepicker.css', 
-        '<%= srcDir &>/css/spectrum.css',
-        '<%= srcDir &>/css/animate.min.css'
+        '<%= srcDir %>/css/normalize.min.css',
+        '<%= srcDir %>/css/bootstrap.dark.min.css',
+        '<%= srcDir %>/css/timepicker.css',
+        '<%= srcDir %>/css/spectrum.css',
+        '<%= srcDir %>/css/animate.min.css'
       ],
       dest: '<%= srcDir %>/css/default.min.css'
     },

tasks/options/ngtemplates.js

@@ -0,0 +1,9 @@
+module.exports = function(config) {
+  return {
+    kibana: {
+      cwd:  '<%= tempDir %>',
+      src:  'app/**/*.html',
+      dest: '<%= tempDir %>/app/components/partials.js',
+    }
+  };
+};