kibana-sinatra 0.0.7 → 0.0.8

data/lib/kibana/assets/vendor/bootstrap/less/variables.light.less

@@ -1,4 +1,4 @@
-//
+// Cosmo 2.3.2
 // Variables
 // --------------------------------------------------
 
@@ -10,43 +10,46 @@
 // Grays
 // -------------------------
 @black:                 #000;
-@grayDarker:            #222;
-@grayDark:              #333;
-@gray:                  #555;
-@grayLight:             #999;
+@grayDarker:            #080808;
+@grayDark:              #999;
+@gray:                  #bbb;
+@grayLight:             #dfdfdf;
 @grayLighter:           #eee;
 @white:                 #fff;
 
 
 // Accent colors
 // -------------------------
-@blue:                  #049cdb;
-@blueDark:              #0064cd;
-@green:                 #46a546;
-@red:                   #9d261d;
-@yellow:                #ffc40d;
-@orange:                #f89406;
-@pink:                  #c3325f;
-@purple:                #7a43b6;
-
+@blue:                  #007FFF;
+@blueDark:              #1F26B6;
+@green:                 #3FB618;
+@red:                   #FF0039;
+@yellow:                #FFA500;
+@orange:                #FF7518;
+@pink:                  #E671B8;
+@purple:                #9954BB;
+
+// Kibana Variables
+// -------------------------
+@kibanaPanelBackground: @white;
 
 // Scaffolding
 // -------------------------
-@bodyBackground:        #ffffff;
-@textColor:             @grayDark;
+@bodyBackground:        @grayLighter;
+@textColor:             #555;
 
 
 // Links
 // -------------------------
-@linkColor:             #08c;
-@linkColorHover:        lighten(@linkColor, 15%);
+@linkColor:             @blue;
+@linkColorHover:        darken(@linkColor, 10%);
 
 
 // Typography
 // -------------------------
 @sansFontFamily:        "Helvetica Neue", Helvetica, Arial, sans-serif;
 @serifFontFamily:       Georgia, "Times New Roman", Times, serif;
-@monoFontFamily:        Monaco, Menlo, Consolas, "Courier New", monospace;
+@monoFontFamily:        Menlo, Monaco, Consolas, "Courier New", monospace;
 
 @baseFontSize:          14px;
 @baseFontFamily:        @sansFontFamily;
@@ -55,7 +58,7 @@
 
 @headingsFontFamily:    inherit; // empty to use BS default, @baseFontFamily
 @headingsFontWeight:    bold;    // instead of browser default, bold
-@headingsColor:         inherit; // empty to use BS default, @textColor
+@headingsColor:         @grayDarker; // empty to use BS default, @textColor
 
 
 // Component sizing
@@ -66,57 +69,56 @@
 @fontSizeSmall:         @baseFontSize * 0.85; // ~12px
 @fontSizeMini:          @baseFontSize * 0.75; // ~11px
 
-@paddingLarge:          11px 19px; // 44px
+@paddingLarge:          22px 30px; // 66px
 @paddingSmall:          2px 10px;  // 26px
-@paddingMini:           0 6px;   // 22px
+@paddingMini:           2px 6px;   // 24px
 
-@baseBorderRadius:      4px;
-@borderRadiusLarge:     6px;
-@borderRadiusSmall:     3px;
+@baseBorderRadius:      3px;
+@borderRadiusLarge:     4px;
+@borderRadiusSmall:     2px;
 
 
 // Tables
 // -------------------------
 @tableBackground:                   transparent; // overall background-color
 @tableBackgroundAccent:             #f9f9f9; // for striping
-@tableBackgroundHover:              #f5f5f5; // for hover
+@tableBackgroundHover:              #E8F8FD; // for hover
 @tableBorder:                       #ddd; // table and cell border
 
 // Buttons
 // -------------------------
-@btnBackground:                     @white;
-@btnBackgroundHighlight:            darken(@white, 10%);
-@btnBorder:                         #ccc;
+@btnBackground:                     @grayLighter;
+@btnBackgroundHighlight:            darken(@grayLighter, 15%);
+@btnBorder:                         #bbb;
 
-@btnPrimaryBackground:              @linkColor;
-@btnPrimaryBackgroundHighlight:     spin(@btnPrimaryBackground, 20%);
+@btnPrimaryBackground:              lighten(@blue, 5%);
+@btnPrimaryBackgroundHighlight:     darken(@blue, 5%);
 
-@btnInfoBackground:                 #5bc0de;
-@btnInfoBackgroundHighlight:        #2f96b4;
+@btnInfoBackground:                 lighten(@purple, 5%);
+@btnInfoBackgroundHighlight:        darken(@purple, 5%);
 
-@btnSuccessBackground:              #62c462;
-@btnSuccessBackgroundHighlight:     #51a351;
+@btnSuccessBackground:              lighten(@green, 5%);
+@btnSuccessBackgroundHighlight:     darken(@green, 5%);
 
-@btnWarningBackground:              lighten(@orange, 15%);
-@btnWarningBackgroundHighlight:     @orange;
+@btnWarningBackground:              lighten(@orange, 5%);
+@btnWarningBackgroundHighlight:     darken(@orange, 5%);
 
-@btnDangerBackground:               #ee5f5b;
-@btnDangerBackgroundHighlight:      #bd362f;
+@btnDangerBackground:               lighten(@red, 5%);
+@btnDangerBackgroundHighlight:      darken(@red, 5%);
 
-@btnInverseBackground:              #444;
-@btnInverseBackgroundHighlight:     @grayDarker;
+@btnInverseBackground:              lighten(@black, 5%);
+@btnInverseBackgroundHighlight:     darken(@black, 5%);
 
 
 // Forms
 // -------------------------
 @inputBackground:               @white;
-@inputBorder:                   #ccc;
+@inputBorder:                   @gray;
 @inputBorderRadius:             @baseBorderRadius;
 @inputDisabledBackground:       @grayLighter;
 @formActionsBackground:         #f5f5f5;
 @inputHeight:                   @baseLineHeight + 10px; // base line-height + 8px vertical padding + 2px top/bottom border
-@inputText:                     @grayDarker;
-
+@inputText:                     #020202;
 
 // Dropdowns
 // -------------------------
@@ -129,7 +131,7 @@
 @dropdownLinkColorHover:        @white;
 @dropdownLinkColorActive:       @white;
 
-@dropdownLinkBackgroundActive:  @linkColor;
+@dropdownLinkBackgroundActive:  @blue;
 @dropdownLinkBackgroundHover:   @dropdownLinkBackgroundActive;
 
 
@@ -158,7 +160,7 @@
 
 // Input placeholder text color
 // -------------------------
-@placeholderText:         @grayLight;
+@placeholderText:         @gray;
 
 
 // Hr border color
@@ -173,52 +175,53 @@
 
 // Wells
 // -------------------------
-@wellBackground:                  #f5f5f5;
+@wellBackground:                  @grayLighter;
 
 
 // Navbar
 // -------------------------
 @navbarCollapseWidth:             979px;
 @navbarCollapseDesktopWidth:      @navbarCollapseWidth + 1;
-@navbarHeight:                    40px;
+
+@navbarHeight:                    50px;
+@navbarBackgroundHighlight:       @grayDarker;
 @navbarBackground:                @grayDarker;
-@navbarBackgroundHighlight:       @grayDark;
-@navbarBorder:                    darken(@navbarBackground, 12%);
+@navbarBorder:                    transparent;
 
 @navbarText:                      @white;
 @navbarLinkColor:                 @white;
-@navbarLinkColorHover:            @white;
-@navbarLinkColorActive:           @navbarLinkColorHover;
-@navbarLinkBackgroundHover:       @grayDark;
-@navbarLinkBackgroundActive:      @navbarBackground;
+@navbarLinkColorHover:            @gray;
+@navbarLinkColorActive:           @white;
+@navbarLinkBackgroundHover:       rgba(0, 0, 0, 0.05);
+@navbarLinkBackgroundActive:      transparent;
 
-@navbarBrandColor:                @grayLighter;
+@navbarBrandColor:                @navbarLinkColor;
 
 // Inverted navbar
-@navbarInverseBackground:                #111111;
-@navbarInverseBackgroundHighlight:       #222222;
-@navbarInverseBorder:                    #252525;
+@navbarInverseBackground:                @blue;
+@navbarInverseBackgroundHighlight:       @navbarInverseBackground;
+@navbarInverseBorder:                    transparent;
 
-@navbarInverseText:                      @grayLight;
-@navbarInverseLinkColor:                 @grayLight;
+@navbarInverseText:                      @white;
+@navbarInverseLinkColor:                 @white;
 @navbarInverseLinkColorHover:            @white;
 @navbarInverseLinkColorActive:           @navbarInverseLinkColorHover;
-@navbarInverseLinkBackgroundHover:       transparent;
+@navbarInverseLinkBackgroundHover:       rgba(0, 0, 0, 0.05);
 @navbarInverseLinkBackgroundActive:      @navbarInverseBackground;
 
 @navbarInverseSearchBackground:          lighten(@navbarInverseBackground, 25%);
 @navbarInverseSearchBackgroundFocus:     @white;
 @navbarInverseSearchBorder:              @navbarInverseBackground;
-@navbarInverseSearchPlaceholderColor:    #ccc;
+@navbarInverseSearchPlaceholderColor:    @grayDark;
 
 @navbarInverseBrandColor:                @navbarInverseLinkColor;
 
 
 // Pagination
 // -------------------------
-@paginationBackground:                #fff;
-@paginationBorder:                    #ddd;
-@paginationActiveBackground:          #f5f5f5;
+@paginationBackground:                @grayLight;
+@paginationBorder:                    transparent;
+@paginationActiveBackground:          @blue;
 
 
 // Hero unit
@@ -230,21 +233,21 @@
 
 // Form states and alerts
 // -------------------------
-@warningText:             #c09853;
-@warningBackground:       #fcf8e3;
-@warningBorder:           darken(spin(@warningBackground, -10), 3%);
+@warningText:             lighten(@orange, 10%);
+@warningBackground:       @orange;
+@warningBorder:           transparent;
 
-@errorText:               #b94a48;
-@errorBackground:         #f2dede;
-@errorBorder:             darken(spin(@errorBackground, -10), 3%);
+@errorText:               lighten(@red, 10%);
+@errorBackground:         @red;
+@errorBorder:             transparent;
 
-@successText:             #468847;
-@successBackground:       #dff0d8;
-@successBorder:           darken(spin(@successBackground, -10), 5%);
+@successText:             lighten(@green, 10%);
+@successBackground:       @green;
+@successBorder:           transparent;
 
-@infoText:                #3a87ad;
-@infoBackground:          #d9edf7;
-@infoBorder:              darken(spin(@infoBackground, -10), 7%);
+@infoText:                lighten(@purple,10%);
+@infoBackground:          @purple;
+@infoBorder:              transparent;
 
 
 // Tooltips and popovers
@@ -254,10 +257,10 @@
 @tooltipArrowWidth:       5px;
 @tooltipArrowColor:       @tooltipBackground;
 
-@popoverBackground:       #fff;
-@popoverArrowWidth:       10px;
-@popoverArrowColor:       #fff;
-@popoverTitleBackground:  darken(@popoverBackground, 3%);
+@popoverBackground:       @white;
+@popoverArrowWidth:       15px;
+@popoverArrowColor:       @white;
+@popoverTitleBackground:  @white;
 
 // Special enhancement for popovers
 @popoverArrowOuterWidth:  @popoverArrowWidth + 1;

data/lib/kibana/assets/vendor/jquery/jquery.flot.events.js

@@ -107,12 +107,12 @@
                     }
 
                 } else {
-                    /*if (options.events.clustering) {
+                    if (options.events.clustering) {
                         _clearEvents();
                         var ed = _clusterEvents(options.events.types, options.events.data, xaxis.max - xaxis.min);
                         _types = ed.types;
                         _setupEvents(ed.data);
-                    }*/
+                    }
                     _updateEvents();
                 }
             }
@@ -177,19 +177,7 @@
         };
 
         var _showTooltip = function(x, y, event){
-            /*
-            var tooltip = $('<div id="tooltip" class=""></div>').appendTo('body').fadeIn(200);
-
-            $('<div id="title">' + event.title + '</div>').appendTo(tooltip);
-            $('<div id="type">Type: ' + event.eventType + '</div>').appendTo(tooltip);
-            $('<div id="description">' + event.description + '</div>').appendTo(tooltip);
-
-            tooltip.css({
-                top: y - tooltip.height() - 5,
-                left: x
-            });
-            console.log(tooltip);
-            */
+            $('#tooltip').remove();
 
             // @rashidkpc - hack to work with our normal tooltip placer
             var $tooltip = $('<div id="tooltip">');
@@ -313,19 +301,25 @@
             //var po = plot.pointOffset({ x: 450, y: 1});
             var container = plot.getPlaceholder(), o = plot.getPlotOffset(), yaxis,
             xaxis = plot.getXAxes()[plot.getOptions().events.xaxis - 1], axes = plot.getAxes();
-            var top, left, div, icon, level, drawableEvent;
+            var top, left, div, icon, level, drawableEvent, eventType;
 
             // determine the y axis used
             if (axes.yaxis && axes.yaxis.used) yaxis = axes.yaxis;
             if (axes.yaxis2 && axes.yaxis2.used) yaxis = axes.yaxis2;
 
+            if(event.eventType.split(',')[1] === 'cluster') {
+                eventType = event.eventType.split(',')[0]
+            } else {
+                eventType = event.eventType;
+            }
+
             // use the default icon and level
-            if (_types == null || !_types[event.eventType] || !_types[event.eventType].icon) {
+            if (_types == null || !_types[eventType] || !_types[eventType].icon) {
                 icon = DEFAULT_ICON;
                 level = 0;
             } else {
-                icon = _types[event.eventType].icon;
-                level = _types[event.eventType].level;
+                icon = _types[eventType].icon;
+                level = _types[eventType].level;
             }
 
             div = $('<i style="position:absolute" class="'+icon.icon+'"></i>').appendTo(container);
@@ -333,6 +327,7 @@
             top = o.top + plot.height() - icon.size + 1;
             left = xaxis.p2c(event.min) + o.left - icon.size / 2;
 
+            // Positions the marker
             div.css({
                 left: left + 'px',
                 top: top,
@@ -348,35 +343,7 @@
             // mouseenter
             function(){
                 var pos = $(this).offset();
-
-                /*// check if the mouse is not already over the event
-                if ($(this).data("bouncing") == false || $(this).data("bouncing") == undefined) {
-
-                    // check the div is not already bouncing
-                    if ($(this).position().top == $(this).data("top")) {
-                        $(this).effect("bounce", {
-                            times: 3
-                        }, 300);
-                    }
-
-                    $(this).data("bouncing", true);
-                    _showTooltip(pos.left + $(this).width() / 2, pos.top, $(this).data("event"));
-                }*/
-
                 _showTooltip(pos.left + $(this).width() / 2, pos.top, $(this).data("event"));
-
-                if (event.min != event.max) {
-                    plot.setSelection({
-                        xaxis: {
-                            from: event.min,
-                            to: event.max
-                        },
-                        yaxis: {
-                            from: yaxis.min,
-                            to: yaxis.max
-                        }
-                    });
-                }
             },
             // mouseleave
             function(){
@@ -480,12 +447,21 @@
                 // each cluser of each event type
                 $.each(eventType, function(index, cluster) {
 
+                    var description = "<strong>"+(cluster.length>5?"Top 5 of ":"") + cluster.length + " events</strong>";
+                    $.each(cluster,function(i,c) {
+                        if(i > 5) {
+                            return;
+                        }
+                        description += '<div style="'+(i%2?'background-color:#444;':'')+
+                            '" style="padding-bottom:0px">'+c.description + "</div>";
+                    });
+
                     var newEvent = {
                         min: cluster[0].min,
                         max: cluster[cluster.length - 1].min,    //TODO: needs to be max of end event if it exists
                         eventType: cluster[0].eventType + ",cluster",
                         title: "Cluster of: " + cluster[0].title,
-                        description: cluster[0].description + ", Number of events in the cluster: " + cluster.length
+                        description: description //+ ", Number of events in the cluster: " + cluster.length
                     };
 
                     newEvents.push(newEvent);
@@ -539,9 +515,11 @@
         var _varianceAlgorithm = function(events, sens, space) {
             var cluster, clusters = [], sum = 0, avg, density;
 
+            events.sort(sortEvents);
+
             // find the average x delta
             for (var i = 1; i < events.length - 1; i++) {
-                sum += events[i].min - events[i - 1].min;
+                sum += events[i].min - events[i-1].min;
             }
             avg = sum / (events.length - 2);
 
@@ -550,11 +528,13 @@
 
             // middle points
             for (var i = 1; i < events.length; i++) {
-                var leftDiff = events[i].min - events[i - 1].min;
+                var leftDiff = events[i - 1].min - events[i].min;
 
                 density = leftDiff / space;
 
-                if (leftDiff > avg * sens && density > 0.05) {
+                var avgSens = avg * sens
+
+                if (leftDiff > avgSens && density > 0.05) {
                     clusters.push(cluster);
                     cluster = [ events[i] ];
                 } else {
@@ -638,4 +618,12 @@
         if (ao.min < bo.min) return -1;
         return 0;
     };
+
+    function sortEvents(a,b) {
+        if (a.min < b.min) return 1;
+        if (a.min > b.min) return -1;
+        return 0;
+    };
+
+
 })(jQuery);