Merge pull request #102 from rashidkpc/master

Moment.js + new color scheme. NOTE: INDEX STRING FORMAT HAS CHANGED

common/css/main.css

@@ -53,7 +53,7 @@
 }
 
 .odd {
-  background-color: #f9f9f9;
+  background-color: #3a3f44;
 }
 
 .nomargin {

common/lib/shared.js

@@ -110,9 +110,9 @@ function add_to_query(original,field,value,negate) {
    */
 function calculate_interval(from,to,size,user_interval) {
   if(_.isObject(from))
-    from = from.getTime();
+    from = from.valueOf();
   if(_.isObject(to))
-    to = to.getTime();
+    to = to.valueOf();
   return user_interval == 0 ? round_interval((to - from)/size) : user_interval;
 }
 

config.js

@@ -1,6 +1,8 @@
 /*
 
-elasticsearch:  URL to your elasticsearch server
+elasticsearch:  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
 kibana_index:   The default ES index to use for storing Kibana specific object
                 such as stored dashboards 
 modules:        Panel modules to load. In the future these will be inferred 

dashboards/default

@@ -30,7 +30,7 @@
           ],
           "timespan": "6h",
           "timefield": "@timestamp",
-          "index": "\"logstash-\"yyyy.mm.dd",
+          "index": "[logstash-]YYYY.MM.DD",
           "defaultindex": "NOINDEX",
           "index_interval": "day",
           "refresh": {

index.html

@@ -12,7 +12,7 @@
   <title>Kibana 3</title>
 
   <link rel="stylesheet" href="common/css/normalize.min.css">
-  <link rel="stylesheet" href="common/css/bootstrap.min.css">
+  <link rel="stylesheet" href="common/css/bootstrap.dark.min.css">
   <link rel="stylesheet" href="common/css/animate.min.css">
   <link rel="stylesheet" href="common/css/bootstrap-responsive.min.css">
   <link rel="stylesheet" href="common/css/font-awesome.min.css">
@@ -37,7 +37,7 @@
   <div class="navbar navbar-static-top">
     <div class="navbar-inner">
       <div class="container-fluid">
-        <p class="navbar-text pull-right"><small><strong>Kibana 3</strong> <small>milestone pre-2</small></small></p>
+        <p class="navbar-text pull-right"><small><strong>Kibana 3</strong> <small>milestone 2</small></small></p>
         <span class="brand">{{dashboards.title}}</span>
         <div class="brand"><i class='icon-edit pointer' ng-show='dashboards.editable' bs-modal="'partials/dasheditor.html'"></i></div>
       </div>

js/app.js

@@ -28,9 +28,7 @@ var labjs = $LAB
   .script("common/lib/angular-sanitize.min.js")
   .script("common/lib/elastic.min.js")
   .script("common/lib/elastic-angular-client.js")
-  .script("common/lib/dateformat.js")
-  .script("common/lib/date.js")
-  .script("common/lib/datepicker.js")
+  .script("common/lib/moment.js")
   .script("common/lib/shared.js")
   .script("common/lib/filesaver.js")
   .script("js/services.js")

panels/histogram/module.js

@@ -249,11 +249,7 @@ angular.module('kibana.histogram', [])
 
   $scope.set_time = function(time) {
     $scope.time = time;
-    // Should I be storing the index on the panel? It causes errors if the index
-    // goes away. Hmmm.
-    $scope.index = time.index || $scope.index
-    // Only calculate interval if auto_int is set, otherwise don't touch it
-
+    $scope.index = time.index || $scope.index    
     $scope.get_data();
   }
 
@@ -305,21 +301,21 @@ angular.module('kibana.histogram', [])
                 points: { show: scope.panel.points, fill: 1, fillColor: false, radius: 5},
                 shadowSize: 1
               },
-              yaxis: { show: scope.panel['y-axis'], min: 0, color: "#000" },
+              yaxis: { show: scope.panel['y-axis'], min: 0, color: "#c8c8c8" },
               xaxis: {
                 timezone: scope.panel.timezone,
                 show: scope.panel['x-axis'],
                 mode: "time",
                 timeformat: time_format(scope.panel.interval),
                 label: "Datetime",
-                color: "#000",
+                color: "#c8c8c8",
               },
               selection: {
                 mode: "x",
                 color: '#ccc'
               },
               grid: {
-                backgroundColor: '#fff',
+                backgroundColor: '#272b30',
                 borderWidth: 0,
                 borderColor: '#eee',
                 color: "#eee",
@@ -359,13 +355,12 @@ angular.module('kibana.histogram', [])
           position: 'absolute',
           top     : y + 5,
           left    : x + 5,
-          color   : "#000",
-          border  : '1px solid #000',
+          color   : "#c8c8c8",
           padding : '10px',
           'font-size': '11pt',
           'font-weight' : 200,
-          'background-color': '#FFF',
-          'border-radius': '10px',
+          'background-color': '#1f1f1f',
+          'border-radius': '5px',
         }).appendTo("body");
       }
 
@@ -374,15 +369,15 @@ angular.module('kibana.histogram', [])
           tt(pos.pageX, pos.pageY,
             "<div style='vertical-align:middle;display:inline-block;background:"+item.series.color+";height:15px;width:15px;border-radius:10px;'></div> "+
             item.datapoint[1].toFixed(0) + " @ " + 
-            new Date(item.datapoint[0]).format('mm/dd HH:MM:ss'));
+            moment(item.datapoint[0]).format('MM/DD HH:mm:ss'));
         } else {
           $("#pie-tooltip").remove();
         }
       });
 
       elem.bind("plotselected", function (event, ranges) {
-        scope.time.from = new Date(ranges.xaxis.from);
-        scope.time.to   = new Date(ranges.xaxis.to)
+        scope.time.from = moment(ranges.xaxis.from);
+        scope.time.to   = moment(ranges.xaxis.to)
         eventBus.broadcast(scope.$id,scope.panel.group,'set_time',scope.time)
       });
     }