Moved kibana related code to a kibana folder

.gitignore

@@ -10,7 +10,7 @@
 /exporter/.settings
 /exporter/config
 /exporter/lib
-/vendor/kibana
+/kibana/vendor/kibana
 /node_modules
 /build
 /.aws-config.json

Gruntfile.js

@@ -4,7 +4,7 @@ module.exports = function (grunt) {
 
   var config = {
     pkg: grunt.file.readJSON('package.json'),
-    kibanaCheckoutDir: './vendor/kibana',
+    kibanaCheckoutDir: './kibana/vendor/kibana',
     kibanaRevision: 'master',
     exporterDir: 'exporter',
     buildDir: 'build',

package.json

@@ -34,6 +34,5 @@
     "grunt-contrib-connect": "~0.5.0",
     "grunt-connect-rewrite": "~0.1.1",
     "csso": "~1.3.10"
-  },
-  "license": "Apache License"
+  }
 }

tasks/build_task.js

@@ -5,6 +5,7 @@ module.exports = function (grunt) {
 
   grunt.registerTask('build', [
     'shell:verify_kibana_status',
+    'jshint:kibana',
     'clean:build',
     'shell:maven_clean',
     'shell:maven_package',

tasks/default_task.js

@@ -1,3 +1,3 @@
 module.exports = function(grunt) {
-  grunt.registerTask('default', ['jshint']);
+  grunt.registerTask('default', ['jshint:kibana', 'jshint:sense']);
 };

tasks/options/connect.js

@@ -14,11 +14,11 @@ module.exports = function (config) {
       }
     },
     rules: {
-      '^/app/dashboards/marvel/(.*)$': '/dashboards/$1',
-      '^/app/panels/marvel/(.*)$': '/panels/$1',
-      '^/config.js$': '/<%= buildTempDir %>/config.js',
-      '^/sense(.*)$': '/sense$1',
-      '^(.*)$': '<%= kibanaCheckoutDir %>/src/$1'
+      '^/kibana/app/dashboards/marvel/(.*)$': '/kibana/dashboards/$1',
+      '^/kibana/app/panels/marvel/(.*)$': '/kibana/panels/$1',
+      '^/kibana/config.js$': '/<%= buildTempDir %>/config.js',
+      '^/kibana(.*)$': '<%= kibanaCheckoutDir %>/src$1',
+      '^/sense(.*)$': '/sense$1'
     }
   };
 };

tasks/options/jshint.js

@@ -1,20 +1,20 @@
 module.exports = function (config) {
   return {
     // just lint the source dir
-    source: {
+    kibana: {
       src: [
         'Gruntfile.js',
-        'panels/**/*.js',
-        'dashboards/**/*.js'
+        'kibana/panels/**/*.js',
+        'kibana/dashboards/**/*.js'
       ],
       options: {
-        jshintrc: '.jshintrc'
+        jshintrc: 'kibana/.jshintrc'
       }
     },
     sense: {
       src: '<%= senseDir %>/app/**/*.js',
       options: {
-        jshintrc: true
+        jshintrc: 'sense/.jshintrc'
       }
     }
   };

tasks/options/replace.js

@@ -19,7 +19,7 @@ module.exports = function (config) {
         ]
       },
       files: [
-        {expand: true, flatten: true, src: ['./config.js'], dest: '<%= buildTempDir %>'}
+        {expand: true, flatten: true, src: ['./kibana/config.js'], dest: '<%= buildTempDir %>'}
       ]
     },
     dist_marvel_config: {
@@ -40,7 +40,7 @@ module.exports = function (config) {
         ]
       },
       files: [
-        {expand: true, flatten: true, src: ['./config.js'], dest: '<%= buildTempDir %>/src/'}
+        {expand: true, flatten: true, src: ['./kibana/config.js'], dest: '<%= buildTempDir %>/src/'}
       ]
     }
   };

tasks/options/requirejs.js

@@ -22,7 +22,7 @@ module.exports = function (grunt) {
         mainConfigFile: '<%= senseDir %>/app/require.config.js',
         optimize: 'uglify2',
         optimizeAllPluginResources: true,
-        preserveLicenseComments: false,
+        preserveLicenseComments: true,
         generateSourceMaps: true,
 
         uglify2: {