Merge branch 'master' into build-tweaks

Conflicts:
	dist/app/components/require.config.js
	src/app/components/require.config.js

README.md

@@ -17,7 +17,7 @@ The dashboard storage format has changed in Kibana 3 milestone 3. Existing dashb
 * Index configuration has been moved from the timepicker, to the main dashboard editor
 * The stringquery panel has been replaced with a more polished 'query' panel
 
-More information about Kibana 3 can be found at [http://three.kibana.org](http://three.kibana.org)  
+More information about Kibana 3 can be found at [http://www.elasticsearch.org/overview/kibana/](http://www.elasticsearch.org/overview/kibana/)  
 
 ## Overview
 
@@ -28,19 +28,19 @@ flexible and powerful
 
 ### Requirements
 * A modern web browser. The latest version of Chrome, Safari and Firefox have all been tested to 
-work. IE8 is not currently supported
+work. IE9 and greater should work. IE8 does not.
 * A webserver. No extensions are required, as long as it can serve plain html it will work
 * A browser reachable Elasticsearch server. Port 9200 must be open, or a proxy configured to allow 
 access to it.
 
 ### Installation
 
-1. Copy the entire Kibana directory to your webserver
-2. Edit config.js to point to your elasticsearch server. This should __not be 
+1. Copy the contents of the dist/ directory to your webserver
+2. Edit config.js in your deployed directory to point to your elasticsearch server. This should __not be 
 http://localhost:9200__, but rather the fully qualified domain name of your elasticsearch server. 
 The url entered here _must be reachable_ by your browser.
 3. Point your browser at your installation. If you're using Logstash with the default indexing 
-configuration the default Kibana dashboard should work nicely. 
+configuration the included Kibana logstash interface should work nicely. 
 
 ### FAQ
 __Q__: Why doesnt it work? I have http://localhost:9200 in my config.js, my webserver and elasticsearch
@@ -55,5 +55,4 @@ __A__: A simple nginx virtual host and proxy configuration can be found in the s
 
 ### Support
 
-Introduction videos can be found at [http://three.kibana.org/about.html](http://three.kibana.org/about.html)  
 If you have questions or comments the best place to reach me is #logstash or #elasticsearch on irc.freenode.net

dist/app/components/require.config.js

@@ -1,4 +1,4 @@
-/*! kibana - v3.0.0m3pre - 2013-09-13
+/*! kibana - v3.0.0m3pre - 2013-09-15
  * Copyright (c) 2013 Rashid Khan; Licensed Apache License */
 
-require.config({baseUrl:"app",urlArgs:"r=6c07338",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"]}});
+require.config({baseUrl:"app",urlArgs:"r=ab93bce",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:"../vendor/jquery/jquery-1.8.0","extend-jquery":"components/extend-jquery","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:{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/dashboards/logstash.js

@@ -137,7 +137,7 @@ dashboard.rows[0].panels = [
 // Add a filtering panel to the 3rd row
 dashboard.rows[1].panels = [
   {
-    type: 'Query'
+    type: 'query'
   }
 ];
 

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

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

dist/app/panels/column/module.js

@@ -1,4 +1,4 @@
-/*! kibana - v3.0.0m3pre - 2013-09-13
+/*! kibana - v3.0.0m3pre - 2013-09-15
  * 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,4 +1,4 @@
-/*! kibana - v3.0.0m3pre - 2013-09-13
+/*! kibana - v3.0.0m3pre - 2013-09-15
  * 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,4 +1,4 @@
-/*! kibana - v3.0.0m3pre - 2013-09-13
+/*! kibana - v3.0.0m3pre - 2013-09-15
  * 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/build.txt

@@ -2,7 +2,6 @@
 app/app.js
 ----------------
 vendor/jquery/jquery-1.8.0.js
-app/components/jquery.extended.js
 vendor/angular/angular.js
 vendor/underscore.js
 app/components/underscore.extended.js
@@ -13,6 +12,7 @@ vendor/angular/angular-sanitize.js
 vendor/angular/timepicker.js
 vendor/angular/datepicker.js
 vendor/angular/angular-strap.js
+app/components/extend-jquery.js
 app/components/settings.js
 app/services/alertSrv.js
 vendor/modernizr-2.6.1.js

dist/vendor/require/css-build.js

@@ -1,4 +1,4 @@
-/*! kibana - v3.0.0m3pre - 2013-09-13
+/*! kibana - v3.0.0m3pre - 2013-09-15
  * Copyright (c) 2013 Rashid Khan; Licensed Apache License */
 
 define(function(){function a(a,b){var d=c.readFileSync(a,"utf8");0===d.indexOf("")&&(d=d.substring(1)),b(d)}function b(a){return a.replace(/[\r\n]+/g," ").replace(/[\t]/g," ")}var c=require.nodeRequire("fs"),d={},e=!1,f={load:function(c,e,f,g){f(!0),a(g.baseUrl+c,function(a){d[c]=b(a)})},write:function(a,b,c){e||(e=!0,c("define('"+a+"-embed', function()\n{\n"+"	function embed_css(content)\n"+"	{\n"+"		var head = document.getElementsByTagName('head')[0],\n"+"		style = document.createElement('style'),\n"+"		rules = document.createTextNode(content);\n"+"		style.type = 'text/css';\n"+"		if(style.styleSheet)\n"+"			style.styleSheet.cssText = rules.nodeValue;\n"+"		else style.appendChild(rules);\n"+"			head.appendChild(style);\n"+"	}\n"+"	return embed_css;\n"+"});\n")),c("define('"+a+"!"+b+"', ['"+a+"-embed'], \n"+"function(embed)\n{\n"+"	embed(\n	'"+d[b].replace(/'/g,"\\'")+"'\n	);\n"+"	return true;\n"+"});\n")},writeFile:function(){},onLayerEnd:function(){}};return f});

dist/vendor/require/tmpl.js

@@ -1,4 +1,4 @@
-/*! kibana - v3.0.0m3pre - 2013-09-13
+/*! kibana - v3.0.0m3pre - 2013-09-15
  * Copyright (c) 2013 Rashid Khan; Licensed Apache License */
 
 define(["module"],function(a){var b=a.config&&a.config()||{};return{load:function(a,c,d){var e=c.toUrl(a);c(["text!"+a],function(a){b.registerTemplate&&b.registerTemplate(e,a),d(a)})}}});

index.html

@@ -1,56 +1,81 @@
 <!DOCTYPE html>
-  <!--[if IE 8]>         <html class="no-js lt-ie9" lang="en"> <![endif]-->
-  <!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width">
 
+  <head>
     <title>Kibana 3</title>
-    <link rel="stylesheet" href="common/css/timepicker.css">
-    <link rel="stylesheet" href="common/css/animate.min.css">
-    <link rel="stylesheet" href="common/css/normalize.min.css">
-    <!-- project dependency libs -->
-    <script src="common/lib/LAB.min.js"></script>
-    <script src="common/lib/underscore.min.js"></script>
-    <script src="common/lib/settings.js"></script>
-    <script src="config.js"></script>
-    <script src="js/app.js"></script>
-
-    <style>
-    </style>
+    <style>/* add your css style rules here */
+    body {
+      color:#c8c8c8;
+      background-color:#272b30;
+      font-family: 'Open Sans', sans-serif;
+    }
+    .title1 {
+      font-weight: 800;
+      line-height: .9;
+      font-size: 98px
+    }
 
-  </head>
+    .title2 {
+      font-weight: 800;
+      line-height: .9;
+      font-size: 60px
+    }
 
-  <body ng-controller="DashCtrl" ng-cloak>
+    .title3 {
+      font-weight: 800;
+      font-size: 25px;
+      line-height: 1.1;
+    }
 
-    <link rel="stylesheet" ng-href="common/css/bootstrap.{{dashboard.current.style||'dark'}}.min.css">
-    <link rel="stylesheet" href="common/css/bootstrap-responsive.min.css">
-    <link rel="stylesheet" href="common/css/font-awesome.min.css">
+    .lowercase {
+      text-transform: lowercase;
+    }
 
-    <div ng-repeat='alert in dashAlerts.list' class="alert-{{alert.severity}} dashboard-notice" ng-show="$last">
-      <button type="button" class="close" ng-click="dashAlerts.clear(alert)" style="padding-right:50px">&times;</button>
-      <strong>{{alert.title}}</strong> <span ng-bind-html-unsafe='alert.text'></span> <div style="padding-right:10px" class='pull-right small'> {{$index + 1}} alert(s) </div>
-    </div>
-    <div class="navbar navbar-static-top">
-      <div class="navbar-inner">
-        <div class="container-fluid">
-          <span class="brand">{{dashboard.current.title}}</span>
-          <ul class="nav" ng-show='dashboard.current.editable'>
-            <li>
-              <a href='#' bs-modal="'partials/dasheditor.html'"><i class='icon-cog pointer'></i></a>
-            </li>
-          </ul>
-          <ul class="nav pull-right" ng-controller='dashLoader' ng-init="init()" ng-include="'partials/dashLoader.html'">
-          </ul>
-        </div>
-      </div>
-    </div>
-    <div class="container-fluid main">
-      <div class="row-fluid">
-        <div ng-view></div>
-      </div>
+    .uppercase {
+      text-transform: uppercase;
+    }
+
+    .light {
+      font-weight: 200;
+    }
+
+    .big { text-transform: uppercase; margin: 0; padding: 0; }
+    .bold { font-weight: 800; }
+
+    .orange {
+      color: #FF9640;
+    }
+
+    .yellow {
+      color: #FFDD68;
+    }
+
+    .teal {
+      color: #63ABB5;
+    }
+
+    .green {
+      color: #629153;
+    }
+
+    .purple {
+      color: #645068;
+    }
+
+    .white {
+      color: #fff;
+    }
+  </style>
+  </head>
+
+  <body ng-controller="DashCtrl" ng-cloak>
+    <img src='dist/img/kibana.png' style="float:right;margin-right:30px;"><p>
+    <div class="title2">
+      <span class="orange">Oops.</span> Looks like you've upgraded from an old version
     </div>
+    <div class="title3">No worries. <span class="light">Kibana has a new build system. Now its faster and lighter than ever before.</span></div>
+    <p>
+    <div class="white title3 uppercase">To fix this</div>
+    <div class="title3 light">Instead of copying the entire kibana repository, you need only copy the contents of the <a href="dist/index.html" class="teal">dist/</a> folder. After upgrading you may need to clear your browsers cache to see all of the new features.</div>
   </body>
 
 </html>

src/app/app.js

@@ -10,7 +10,8 @@ define([
   'elasticjs',
   'bootstrap',
   'angular-sanitize',
-  'angular-strap'
+  'angular-strap',
+  'extend-jquery'
 ],
 function (angular, $, _, appLevelRequire) {
   "use strict";

src/app/components/jquery.extended.js → src/app/components/extend-jquery.js

@@ -1,4 +1,4 @@
-define(['jquery-src'],
+define(['jquery'],
 function ($) {
   'use strict';
 

src/app/components/require.config.js

@@ -24,8 +24,10 @@ require.config({
     'underscore-src':         '../vendor/underscore',
     bootstrap:                '../vendor/bootstrap/bootstrap',
 
-    jquery:                   'components/jquery.extended',
-    'jquery-src':             '../vendor/jquery/jquery-1.8.0',
+    jquery:                   '../vendor/jquery/jquery-1.8.0',
+
+    'extend-jquery':          'components/extend-jquery',
+
     'jquery.flot':            '../vendor/jquery/jquery.flot',
     'jquery.flot.pie':        '../vendor/jquery/jquery.flot.pie',
     'jquery.flot.selection':  '../vendor/jquery/jquery.flot.selection',
@@ -53,7 +55,7 @@ require.config({
       exports: 'Modernizr'
     },
 
-    'jquery-src': {
+    jquery: {
       exports: 'jQuery'
     },
 

src/app/dashboards/logstash.js

@@ -137,7 +137,7 @@ dashboard.rows[0].panels = [
 // Add a filtering panel to the 3rd row
 dashboard.rows[1].panels = [
   {
-    type: 'Query'
+    type: 'query'
   }
 ];