From ef44560ce272893ecc8de6638649f5a650e503c8 Mon Sep 17 00:00:00 2001 From: Boaz Leskes Date: Tue, 21 Jan 2014 14:44:40 +0100 Subject: [PATCH] Moved kibana related code to a kibana folder --- .gitignore | 2 +- Gruntfile.js | 2 +- .jshintrc => kibana/.jshintrc | 0 config.js => kibana/config.js | 0 {dashboards => kibana/dashboards}/cluster_pulse.json | 0 {dashboards => kibana/dashboards}/indices_stats.js | 0 {dashboards => kibana/dashboards}/nodes_stats.js | 0 {dashboards => kibana/dashboards}/overview.json | 0 {dashboards => kibana/dashboards}/shards.json | 0 {panels => kibana/panels}/cluster/editor.html | 0 {panels => kibana/panels}/cluster/module.html | 0 {panels => kibana/panels}/cluster/module.js | 0 {panels => kibana/panels}/cluster/optin.html | 0 {panels => kibana/panels}/stats_table/editor.html | 0 {panels => kibana/panels}/stats_table/module.html | 0 {panels => kibana/panels}/stats_table/module.js | 0 package.json | 3 +-- tasks/build_task.js | 1 + tasks/default_task.js | 2 +- tasks/options/connect.js | 10 +++++----- tasks/options/jshint.js | 10 +++++----- tasks/options/replace.js | 4 ++-- tasks/options/requirejs.js | 2 +- 23 files changed, 18 insertions(+), 18 deletions(-) rename .jshintrc => kibana/.jshintrc (100%) rename config.js => kibana/config.js (100%) rename {dashboards => kibana/dashboards}/cluster_pulse.json (100%) rename {dashboards => kibana/dashboards}/indices_stats.js (100%) rename {dashboards => kibana/dashboards}/nodes_stats.js (100%) rename {dashboards => kibana/dashboards}/overview.json (100%) rename {dashboards => kibana/dashboards}/shards.json (100%) rename {panels => kibana/panels}/cluster/editor.html (100%) rename {panels => kibana/panels}/cluster/module.html (100%) rename {panels => kibana/panels}/cluster/module.js (100%) rename {panels => kibana/panels}/cluster/optin.html (100%) rename {panels => kibana/panels}/stats_table/editor.html (100%) rename {panels => kibana/panels}/stats_table/module.html (100%) rename {panels => kibana/panels}/stats_table/module.js (100%) diff --git a/.gitignore b/.gitignore index 8a93baa6c2bf..bd1eae1f3de7 100644 --- a/.gitignore +++ b/.gitignore @@ -10,7 +10,7 @@ /exporter/.settings /exporter/config /exporter/lib -/vendor/kibana +/kibana/vendor/kibana /node_modules /build /.aws-config.json diff --git a/Gruntfile.js b/Gruntfile.js index 4fc0b8513ad7..c61f57f65a17 100644 --- a/Gruntfile.js +++ b/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', diff --git a/.jshintrc b/kibana/.jshintrc similarity index 100% rename from .jshintrc rename to kibana/.jshintrc diff --git a/config.js b/kibana/config.js similarity index 100% rename from config.js rename to kibana/config.js diff --git a/dashboards/cluster_pulse.json b/kibana/dashboards/cluster_pulse.json similarity index 100% rename from dashboards/cluster_pulse.json rename to kibana/dashboards/cluster_pulse.json diff --git a/dashboards/indices_stats.js b/kibana/dashboards/indices_stats.js similarity index 100% rename from dashboards/indices_stats.js rename to kibana/dashboards/indices_stats.js diff --git a/dashboards/nodes_stats.js b/kibana/dashboards/nodes_stats.js similarity index 100% rename from dashboards/nodes_stats.js rename to kibana/dashboards/nodes_stats.js diff --git a/dashboards/overview.json b/kibana/dashboards/overview.json similarity index 100% rename from dashboards/overview.json rename to kibana/dashboards/overview.json diff --git a/dashboards/shards.json b/kibana/dashboards/shards.json similarity index 100% rename from dashboards/shards.json rename to kibana/dashboards/shards.json diff --git a/panels/cluster/editor.html b/kibana/panels/cluster/editor.html similarity index 100% rename from panels/cluster/editor.html rename to kibana/panels/cluster/editor.html diff --git a/panels/cluster/module.html b/kibana/panels/cluster/module.html similarity index 100% rename from panels/cluster/module.html rename to kibana/panels/cluster/module.html diff --git a/panels/cluster/module.js b/kibana/panels/cluster/module.js similarity index 100% rename from panels/cluster/module.js rename to kibana/panels/cluster/module.js diff --git a/panels/cluster/optin.html b/kibana/panels/cluster/optin.html similarity index 100% rename from panels/cluster/optin.html rename to kibana/panels/cluster/optin.html diff --git a/panels/stats_table/editor.html b/kibana/panels/stats_table/editor.html similarity index 100% rename from panels/stats_table/editor.html rename to kibana/panels/stats_table/editor.html diff --git a/panels/stats_table/module.html b/kibana/panels/stats_table/module.html similarity index 100% rename from panels/stats_table/module.html rename to kibana/panels/stats_table/module.html diff --git a/panels/stats_table/module.js b/kibana/panels/stats_table/module.js similarity index 100% rename from panels/stats_table/module.js rename to kibana/panels/stats_table/module.js diff --git a/package.json b/package.json index 8626ad81941e..5e1331dc5b28 100644 --- a/package.json +++ b/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" + } } diff --git a/tasks/build_task.js b/tasks/build_task.js index 6aaa92871890..945c3f892558 100644 --- a/tasks/build_task.js +++ b/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', diff --git a/tasks/default_task.js b/tasks/default_task.js index 0bca713ddfd6..22bf45b556a9 100644 --- a/tasks/default_task.js +++ b/tasks/default_task.js @@ -1,3 +1,3 @@ module.exports = function(grunt) { - grunt.registerTask('default', ['jshint']); + grunt.registerTask('default', ['jshint:kibana', 'jshint:sense']); }; \ No newline at end of file diff --git a/tasks/options/connect.js b/tasks/options/connect.js index 5c448f306e18..fe66a9bf6bbe 100644 --- a/tasks/options/connect.js +++ b/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' } }; }; \ No newline at end of file diff --git a/tasks/options/jshint.js b/tasks/options/jshint.js index 5124044b4f44..9ecbbec9c350 100644 --- a/tasks/options/jshint.js +++ b/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' } } }; diff --git a/tasks/options/replace.js b/tasks/options/replace.js index c26e0fa9c803..f854dd6fbefa 100644 --- a/tasks/options/replace.js +++ b/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/'} ] } }; diff --git a/tasks/options/requirejs.js b/tasks/options/requirejs.js index c5965b3537b5..ec67e3110e62 100644 --- a/tasks/options/requirejs.js +++ b/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: {