Merge pull request #494 from spenceralger/build-tweaks

Build tweaks

Gruntfile.js

@@ -30,13 +30,7 @@ module.exports = function (grunt) {
           'panels/bettermap/leaflet/*.png'
         ],
         dest: '<%= tempDir %>'
-      }//,
-      // dist_to_temp: {
-      //   cwd: '<%= destDir %>',
-      //   expand: true,
-      //   src: '**/*',
-      //   dest: '<%= tempDir %>'
-      // }
+      }
     },
     jshint: {
       // just lint the source dir
@@ -111,19 +105,13 @@ module.exports = function (grunt) {
           modules: [], // populated below
           mainConfigFile: '<%= tempDir %>/app/components/require.config.js',
           keepBuildDir: true,
-          optimize: 'uglify',
+          optimize: 'none',
           optimizeCss: 'none',
-          uglify: {
-            max_line_length: 1000,
-            // beautify: true, // uncomment for easier debugging
-            indent_level: 2,
-          },
           preserveLicenseComments: false,
           findNestedDependencies: true,
           normalizeDirDefines: "none",
           inlineText: true,
           skipPragmas: true,
-          // stubModules: ["text"],
           optimizeAllPluginResources: false,
           removeCombined: true,
           fileExclusionRegExp: /^\./,
@@ -147,6 +135,20 @@ module.exports = function (grunt) {
           }
         }
       }
+    },
+    uglify: {
+      dest: {
+        expand: true,
+        src: ['**/*.js', '!config.js', '!app/dashboards/*.js'],
+        dest: '<%= destDir %>',
+        cwd: '<%= destDir %>',
+        options: {
+          quite: true,
+          compress: true,
+          preserveComments: false,
+          banner: '<%= meta.banner %>',
+        }
+      }
     }
   };
 
@@ -173,7 +175,8 @@ module.exports = function (grunt) {
         'services/all',
         'jquery.flot',
         'jquery.flot.pie',
-        'text'
+        'text',
+        'settings'
       ]
     }
   ];
@@ -186,6 +189,12 @@ module.exports = function (grunt) {
     });
   });
 
+  // exclude the literal config definition from all modules
+  requireModules.forEach(function (module) {
+    module.excludeShallow = module.excludeShallow || [];
+    module.excludeShallow.push('config');
+  });
+
   config.requirejs.compile_temp.options.modules = requireModules;
 
   // load plugins
@@ -213,7 +222,8 @@ module.exports = function (grunt) {
     'copy:everthing_left_in_src',
     'ngmin',
     'requirejs:compile_temp',
-    'clean:after_require'
+    'clean:after_require',
+    'uglify:dest'
   ]);
 
 };

dist/app/components/require.config.js

@@ -1,2 +1,4 @@
-require.config({baseUrl:"app",paths:{settings:"components/settings",kbn:"components/kbn",css:"../vendor/require/css",text:"../vendor/require/text",moment:"../vendor/moment",filesaver:"../vendor/filesaver",angular:"../vendor/angular/angular","angular-strap":"../vendor/angular/angular-strap","angular-sanitize":"../vendor/angular/angular-sanitize",timepicker:"../vendor/angular/timepicker",datepicker:"../vendor/angular/datepicker",underscore:"components/underscore.extended","underscore-src":"../vendor/underscore",bootstrap:"../vendor/bootstrap/bootstrap",jquery:"components/jquery.extended","jquery-src":"../vendor/jquery/jquery-1.8.0","jquery.flot":"../vendor/jquery/jquery.flot","jquery.flot.pie":"../vendor/jquery/jquery.flot.pie","jquery.flot.selection":"../vendor/jquery/jquery.flot.selection","jquery.flot.stack":"../vendor/jquery/jquery.flot.stack","jquery.flot.time":"../vendor/jquery/jquery.flot.time",modernizr:"../vendor/modernizr-2.6.1",elasticjs:"../vendor/elasticjs/elastic-angular-client"
-},shim:{underscore:{exports:"_"},angular:{deps:["jquery"],exports:"angular"},bootstrap:{deps:["jquery"]},modernizr:{exports:"Modernizr"},"jquery-src":{exports:"jQuery"},"jquery.flot":["jquery"],"jquery.flot.pie":["jquery","jquery.flot"],"jquery.flot.selection":["jquery","jquery.flot"],"jquery.flot.stack":["jquery","jquery.flot"],"jquery.flot.time":["jquery","jquery.flot"],"angular-sanitize":["angular"],"angular-cookies":["angular"],"angular-loader":["angular"],"angular-mocks":["angular"],"angular-resource":["angular"],"angular-route":["angular"],"angular-touch":["angular"],"angular-strap":["angular","bootstrap","timepicker","datepicker"],timepicker:["jquery","bootstrap"],datepicker:["jquery","bootstrap"],elasticjs:["angular","../vendor/elasticjs/elastic"]}});
+/*! kibana - v3.0.0m3pre - 2013-09-13
+ * Copyright (c) 2013 Rashid Khan; Licensed Apache License */
+
+require.config({baseUrl:"app",paths:{config:"../config",settings:"components/settings",kbn:"components/kbn",css:"../vendor/require/css",text:"../vendor/require/text",moment:"../vendor/moment",filesaver:"../vendor/filesaver",angular:"../vendor/angular/angular","angular-strap":"../vendor/angular/angular-strap","angular-sanitize":"../vendor/angular/angular-sanitize",timepicker:"../vendor/angular/timepicker",datepicker:"../vendor/angular/datepicker",underscore:"components/underscore.extended","underscore-src":"../vendor/underscore",bootstrap:"../vendor/bootstrap/bootstrap",jquery:"components/jquery.extended","jquery-src":"../vendor/jquery/jquery-1.8.0","jquery.flot":"../vendor/jquery/jquery.flot","jquery.flot.pie":"../vendor/jquery/jquery.flot.pie","jquery.flot.selection":"../vendor/jquery/jquery.flot.selection","jquery.flot.stack":"../vendor/jquery/jquery.flot.stack","jquery.flot.time":"../vendor/jquery/jquery.flot.time",modernizr:"../vendor/modernizr-2.6.1",elasticjs:"../vendor/elasticjs/elastic-angular-client"},shim:{underscore:{exports:"_"},angular:{deps:["jquery"],exports:"angular"},bootstrap:{deps:["jquery"]},modernizr:{exports:"Modernizr"},"jquery-src":{exports:"jQuery"},"jquery.flot":["jquery"],"jquery.flot.pie":["jquery","jquery.flot"],"jquery.flot.selection":["jquery","jquery.flot"],"jquery.flot.stack":["jquery","jquery.flot"],"jquery.flot.time":["jquery","jquery.flot"],"angular-sanitize":["angular"],"angular-cookies":["angular"],"angular-loader":["angular"],"angular-mocks":["angular"],"angular-resource":["angular"],"angular-route":["angular"],"angular-touch":["angular"],"angular-strap":["angular","bootstrap","timepicker","datepicker"],timepicker:["jquery","bootstrap"],datepicker:["jquery","bootstrap"],elasticjs:["angular","../vendor/elasticjs/elastic"]}});

dist/app/panels/bettermap/leaflet.amd.js

@@ -1 +1,3 @@
-;
+/*! kibana - v3.0.0m3pre - 2013-09-13
+ * Copyright (c) 2013 Rashid Khan; Licensed Apache License */
+

dist/app/panels/column/module.js

@@ -1,2 +1,4 @@
-define("panels/column/module",["angular","app","underscore","config"],function(e,t,n,r){var i=e.module("kibana.panels.column",[]);t.useModule(i),i.controller("column",["$scope","$rootScope","$timeout",function(e,t,r){e.panelMeta={status:"Stable",description:"A pseudo panel that lets you add other panels to be arranged in a column withdefined heights."};var i={panels:[]};n.defaults(e.panel,i),e.init=function(){e.reset_panel()},e.toggle_row=function(t){t.collapse=t.collapse?!1:!0,t.collapse||r(function(){e.send_render()})},e.send_render=function(){e.$broadcast("render")},e.add_panel=function(t){e.panel.panels.push(t)},e.reset_panel=function(t){e.new_panel={loading:!1,error:!1,sizeable:!1,span:12,height:"150px",editable:!0,type:t}}}]),i.directive("columnEdit",["$compile","$timeout",function(t,r){return{scope:{new_panel:"=panel",row:"=",config:"=",dashboards:"=",type:"=type"},link:function(i,s){i.$on("render",function(){r(function(){i.panel=i.new_panel;var r="<div ng-include src=\"partial('panelgeneral')\"></div>"
-;!n.isUndefined(i.type)&&i.type!==""&&(r=r+"<div ng-include src=\"'app/panels/"+i.type+"/editor.html'\"></div>"),s.html(t(e.element(r))(i))})})}}}]),i.filter("withoutColumn",function(){return function(){return n.without(r.panel_names,"column")}})});
+/*! kibana - v3.0.0m3pre - 2013-09-13
+ * Copyright (c) 2013 Rashid Khan; Licensed Apache License */
+
+define("panels/column/module",["angular","app","underscore","config"],function(a,b,c,d){var e=a.module("kibana.panels.column",[]);b.useModule(e),e.controller("column",["$scope","$rootScope","$timeout",function(a,b,d){a.panelMeta={status:"Stable",description:"A pseudo panel that lets you add other panels to be arranged in a column withdefined heights."};var e={panels:[]};c.defaults(a.panel,e),a.init=function(){a.reset_panel()},a.toggle_row=function(b){b.collapse=b.collapse?!1:!0,b.collapse||d(function(){a.send_render()})},a.send_render=function(){a.$broadcast("render")},a.add_panel=function(b){a.panel.panels.push(b)},a.reset_panel=function(b){a.new_panel={loading:!1,error:!1,sizeable:!1,span:12,height:"150px",editable:!0,type:b}}}]),e.directive("columnEdit",["$compile","$timeout",function(b,d){return{scope:{new_panel:"=panel",row:"=",config:"=",dashboards:"=",type:"=type"},link:function(e,f){e.$on("render",function(){d(function(){e.panel=e.new_panel;var d="<div ng-include src=\"partial('panelgeneral')\"></div>";c.isUndefined(e.type)||""===e.type||(d=d+"<div ng-include src=\"'app/panels/"+e.type+"/editor.html'\"></div>"),f.html(b(a.element(d))(e))})})}}}]),e.filter("withoutColumn",function(){return function(){return c.without(d.panel_names,"column")}})});

dist/app/panels/fields/module.js

@@ -1 +1,4 @@
-define("panels/fields/module",["angular","app","underscore"],function(e,t,n){var r=e.module("kibana.panels.fields",[]);t.useModule(r),r.controller("fields",["$scope",function(e){e.panelMeta={status:"Deprecated",description:"You should not use this table, it does not work anymore. The table panel nowintegrates a field selector. This module will soon be removed."};var t={style:{},arrange:"vertical",micropanel_position:"right"};n.defaults(e.panel,t),e.init=function(){}}])});
+/*! kibana - v3.0.0m3pre - 2013-09-13
+ * Copyright (c) 2013 Rashid Khan; Licensed Apache License */
+
+define("panels/fields/module",["angular","app","underscore"],function(a,b,c){var d=a.module("kibana.panels.fields",[]);b.useModule(d),d.controller("fields",["$scope",function(a){a.panelMeta={status:"Deprecated",description:"You should not use this table, it does not work anymore. The table panel nowintegrates a field selector. This module will soon be removed."};var b={style:{},arrange:"vertical",micropanel_position:"right"};c.defaults(a.panel,b),a.init=function(){}}])});

dist/app/panels/filtering/module.js

@@ -1 +1,4 @@
-define("panels/filtering/module",["angular","app","underscore"],function(e,t,n){var r=e.module("kibana.panels.filtering",[]);t.useModule(r),r.controller("filtering",["$scope","filterSrv","$rootScope","dashboard",function(e,t,r,i){e.panelMeta={status:"Beta",description:"A controllable list of all filters currently applied to the dashboard. You almost certainly want one of these on your dashboard somewhere."};var s={};n.defaults(e.panel,s),e.init=function(){e.filterSrv=t},e.remove=function(e){t.remove(e),i.refresh()},e.toggle=function(e){t.list[e].active=!t.list[e].active,i.refresh()},e.refresh=function(){r.$broadcast("refresh")},e.render=function(){r.$broadcast("render")},e.show_key=function(e){return!n.contains(["type","id","alias","mandate","active","editing"],e)},e.isEditable=function(e){var t=["time"];return n.contains(t,e.type)?!1:!0}}])});
+/*! kibana - v3.0.0m3pre - 2013-09-13
+ * Copyright (c) 2013 Rashid Khan; Licensed Apache License */
+
+define("panels/filtering/module",["angular","app","underscore"],function(a,b,c){var d=a.module("kibana.panels.filtering",[]);b.useModule(d),d.controller("filtering",["$scope","filterSrv","$rootScope","dashboard",function(a,b,d,e){a.panelMeta={status:"Beta",description:"A controllable list of all filters currently applied to the dashboard. You almost certainly want one of these on your dashboard somewhere."};var f={};c.defaults(a.panel,f),a.init=function(){a.filterSrv=b},a.remove=function(a){b.remove(a),e.refresh()},a.toggle=function(a){b.list[a].active=!b.list[a].active,e.refresh()},a.refresh=function(){d.$broadcast("refresh")},a.render=function(){d.$broadcast("render")},a.show_key=function(a){return!c.contains(["type","id","alias","mandate","active","editing"],a)},a.isEditable=function(a){var b=["time"];return c.contains(b,a.type)?!1:!0}}])});

dist/app/panels/histogram/module.html

@@ -1,4 +1,4 @@
-<div ng-controller="histogram" ng-init="init()" style="height:{{panel.height || row.height}}"><style>.histogram-legend {
+<div ng-controller="histogram" ng-init="init()" style="min-height:{{panel.height || row.height}}"><style>.histogram-legend {
       display:inline-block;
       padding-right:5px
     }

dist/build.txt

@@ -14,7 +14,6 @@ vendor/angular/timepicker.js
 vendor/angular/datepicker.js
 vendor/angular/angular-strap.js
 app/components/settings.js
-app/config.js
 app/services/alertSrv.js
 vendor/modernizr-2.6.1.js
 app/services/dashboard.js

dist/config.js

@@ -0,0 +1,54 @@
+/**
+ * These is the app's configuration, If you need to configure
+ * the default dashboard, please see dashboards/default
+ */
+define(['settings'],
+function (Settings) {
+  
+
+  return new Settings({
+
+    /**
+     * URL to your elasticsearch server. You almost certainly don't
+     * want 'http://localhost:9200' here. Even if Kibana and ES are on
+     * the same host
+     *
+     * By default this will attempt to reach ES at the same host you have
+     * elasticsearch installed on. You probably want to set it to the FQDN of your
+     * elasticsearch host
+     * @type {String}
+     */
+    elasticsearch: "http://"+window.location.hostname+":9200",
+
+    /**
+     * The default ES index to use for storing Kibana specific object
+     * such as stored dashboards
+     * @type {String}
+     */
+    kibana_index: "kibana-int",
+
+    /**
+     * Panel modules available. Panels will only be loaded when they are defined in the
+     * dashboard, but this list is used in the "add panel" interface.
+     * @type {Array}
+     */
+    panel_names: [
+      'histogram',
+      'map',
+      'pie',
+      'table',
+      'filtering',
+      'timepicker',
+      'text',
+      'fields',
+      'hits',
+      'dashcontrol',
+      'column',
+      'derivequeries',
+      'trends',
+      'bettermap',
+      'query',
+      'terms'
+    ]
+  });
+});