logstash-lite 0.2.20110206003603 → 0.2.20110329105411

data/lib/logstash/web/views/layout.haml

@@ -4,7 +4,7 @@
     %title= @title || "logstash" 
     %link{ :rel => "stylesheet", :href => "/style.css", :type => "text/css" }
     %link{ :rel => "stylesheet", :href => "/css/smoothness/jquery-ui-1.8.5.custom.css", :type => "text/css" }
-    %script{ :src => "https://ajax.googleapis.com/ajax/libs/jquery/1.4.3/jquery.min.js", 
+    %script{ :src => "https://ajax.googleapis.com/ajax/libs/jquery/1.5.0/jquery.min.js", 
              :type => "text/javascript" }
 %body
   #header

data/lib/logstash/web/views/search/ajax.haml

@@ -2,34 +2,39 @@
   - if (params[:q].strip.length > 0 rescue false)
     %h1
       Search results for '#{params[:q]}'
-  - if @graphpoints
-    #visual
-    :javascript
-      $(function() {
-        var graphdata = #{@graphpoints.to_json};
-        window.logstash.plot(graphdata);
-      });
   - if @total and @result_start and @result_end
     %small
       %strong
-        Results #{@result_start} - #{@result_end} of #{@total}
+        Results #{@result_start} - #{@result_end} of #{@results.total}
       |
       - if @first_href
         %a.pager{ :href => @first_href } first
-        |
+      - else
+        %span.unavailable first
+      |
       - if @prev_href
         %a.pager{ :href => @prev_href } 
           prev
-        - if @next_href
-          |
+      - else
+        %span.unavailable prev
+      |
       - if @next_href
         %a.pager{ :href => @next_href }
           next
+      - else
+        %span.unavailable next
+      |
       - if @last_href
-        |
         %a.pager{ :href => @last_href }
           last
-  - if @hits.length == 0 
+      - else
+        %span.unavailable last
+      |
+      %a.pager{ :href => @refresh_href }
+        refresh
+      |
+      %span#querytime= "(%.3f seconds)" % @results.duration
+  - if @results.events.length == 0 
     - if !params[:q]
       / We default to a '+2 days' in the future  to capture 'today at 00:00'
       / plus tomorrow, inclusive, in case you are 23 hours behind the international
@@ -42,8 +47,9 @@
       %tr
         %th timestamp
         %th event
-      - @hits.reverse.each do |hit|
+      - @results.events.reverse.each do |event|
         %tr.event
-          %td.timestamp&= hit["_source"]["@timestamp"]
-          %td.message{ :"data-full" => hit.to_json }
-            %pre&= hit["_source"]["@message"]
+          %td.timestamp&= event.timestamp
+          %td.message{ :"data-full" => event.to_json }
+            %a{:href => "#"}
+              %pre&= event.message

data/lib/logstash/web/views/search/error.haml

@@ -1,3 +1,3 @@
 #error
   %h4 The query '#{params["q"]}' resulted the following error:
-  %pre&= @results["error"]
+  %pre&= @results.error_message

data/lib/logstash/web/views/search/error.txt.erb

@@ -0,0 +1,4 @@
+An error occured in query '<%= params[:q] %>'
+ERROR:
+
+<%= @results.error_message %>

data/lib/logstash/web/views/search/results.haml

@@ -14,4 +14,7 @@
   for that event. You can also click on the graph to zoom to that time period.
   The query language is that of Lucene's string query (<a href="http://lucene.apache.org/java/2_4_0/queryparsersyntax.html">docs</a>).
 
+
+#visual
+
 =haml :"search/ajax", :layout => false

data/lib/logstash/web/views/search/results.txt.erb

@@ -1,9 +1,8 @@
 <% 
   # Sinatra currently doesn't do ERB with newline trimming, so we
-  # have to write this funky mishmosh that is hard to read.
-if @error %>Error: <%= @error %><% else
-  @hits.each do |hit|
-    event = LogStash::Event.new(hit["_source"])
+  # have to write this funky mishmosh on one line that is hard to read.
+if @results.error? %>Error: <%= @results.error_message%><% else
+  @results.events.each do |event|
 %><%= event.message || event.to_hash.to_json %>
 <%   end
    end 

data/lib/logstash/web/views/style.sass

@@ -29,6 +29,9 @@ body
   pre
     white-space: pre-wrap
     margin: 0
+  a
+    text-decoration: none
+    color: black
 #content td.timestamp
   white-space: nowrap
   padding: 1px
@@ -54,8 +57,11 @@ body
   margin: 0
 #inspector
   font-size: 70%
-#results #visual
+#visual
   width: 850px
   height: 200px
+  display: none
 #results h1
   font-size: 100%
+img.throbber
+  vertical-align: top

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: logstash-lite
 version: !ruby/object:Gem::Version 
-  hash: 40220412007217
+  hash: 40220658210833
   prerelease: 
   segments: 
   - 0
   - 2
-  - 20110206003603
-  version: 0.2.20110206003603
+  - 20110329105411
+  version: 0.2.20110329105411
 platform: ruby
 authors: 
 - Jordan Sissel
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-06 00:00:00 -08:00
+date: 2011-03-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -116,6 +116,14 @@ files:
 - lib/logstash/outputs/tcp.rb
 - lib/logstash/namespace.rb
 - lib/logstash/rubyfixes/regexp_union_takes_array.rb
+- lib/logstash/search/facetresult/entry.rb
+- lib/logstash/search/facetresult/histogram.rb
+- lib/logstash/search/elasticsearch.rb
+- lib/logstash/search/result.rb
+- lib/logstash/search/base.rb
+- lib/logstash/search/facetresult.rb
+- lib/logstash/search/query.rb
+- lib/logstash/search/twitter.rb
 - lib/logstash/time.rb
 - lib/logstash/filters.rb
 - lib/logstash/outputs.rb
@@ -129,7 +137,7 @@ files:
 - lib/logstash/filters/date.rb
 - lib/logstash/logging.rb
 - lib/logstash/event.rb
-- lib/logstash/web/lib/elasticsearch.rb
+- lib/logstash/web/helpers/require_param.rb
 - lib/logstash/web/public/css/smoothness/jquery-ui-1.8.5.custom.css
 - lib/logstash/web/public/css/smoothness/images/ui-icons_2e83ff_256x240.png
 - lib/logstash/web/public/css/smoothness/images/ui-icons_cd0a0a_256x240.png
@@ -208,12 +216,16 @@ files:
 - lib/logstash/web/public/js/flot/jquery.flot.navigate.js
 - lib/logstash/web/public/js/flot/jquery.min.js
 - lib/logstash/web/public/js/flot/PLUGINS.txt
+- lib/logstash/web/public/media/construction.gif
+- lib/logstash/web/public/media/throbber.gif
+- lib/logstash/web/public/media/truckconstruction.gif
 - lib/logstash/web/server.rb
 - lib/logstash/web/views/style.sass
 - lib/logstash/web/views/main/index.haml
 - lib/logstash/web/views/layout.haml
 - lib/logstash/web/views/search/results.txt.erb
 - lib/logstash/web/views/search/ajax.haml
+- lib/logstash/web/views/search/error.txt.erb
 - lib/logstash/web/views/search/results.haml
 - lib/logstash/web/views/search/error.haml
 - lib/logstash/web/views/header.haml
@@ -278,7 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: logstash - log and event management (lite install, no dependencies)

data/lib/logstash/web/lib/elasticsearch.rb

@@ -1,85 +0,0 @@
-
-require "em-http-request"
-require "logstash/namespace"
-require "logstash/logging"
-require "logstash/event"
-
-module LogStash::Web; end
-
-class LogStash::Web::ElasticSearch
-  public
-  def initialize
-    @logger = LogStash::Logger.new(STDOUT)
-  end
-
-  public
-  def search(params)
-    http = EventMachine::HttpRequest.new("http://localhost:9200/_search")
-    params[:offset] ||= 0
-    params[:count] ||= 20
-
-    @logger.info(["Query", params])
-    esreq = {
-      "sort" => [
-        { "@timestamp" => "desc" }
-      ],
-      "query" => {
-        "query_string" => { 
-           "query" => params[:q],
-           "default_operator" => "AND"
-        } # query_string
-      }, # query
-      "facets" => {
-        "by_hour" => { 
-          "histogram" => {
-            "field" => "@timestamp",
-            "time_interval" => "1h",
-          }, # histogram
-        }, # by_hour
-      }, # facets
-      "from" => params[:offset],
-      "size" => params[:count],
-    }
-
-    @logger.info("ElasticSearch Query: #{esreq.to_json}")
-    start_time = Time.now
-    req = http.get :body => esreq.to_json
-    req.callback do
-      #headers req.response_header
-      data = JSON.parse(req.response)
-      data["duration"] = Time.now - start_time
-
-      # TODO(sissel): Plugin-ify this (Search filters!)
-      #  Search anonymization
-      #require "digest/md5"
-      #data["hits"]["hits"].each do |hit|
-      [].each do |hit|
-        event = LogStash::Event.new(hit["_source"])
-        event.to_hash.each do |key, value|
-          next unless value.is_a?(String)
-          value.gsub!(/[^ ]+\.loggly\.net/) { |match| "loggly-" + Digest::MD5.hexdigest(match)[0..6]  + ".example.com"}
-        end
-
-        event.fields.each do |key, value|
-          value = [value] if value.is_a?(String)
-          next unless value.is_a?(Array)
-          value.each do |v|
-            v.gsub!(/[^ ]+\.loggly\.net/) { |match| "loggly-" + Digest::MD5.hexdigest(match)[0..6]  + ".example.com"}
-          end # value.each
-        end # hit._source.@fields.each
-      end # data.hits.hits.each
-
-      @logger.info(["Got search results", 
-                   { :query => params[:q], :duration => data["duration"]}])
-      #@logger.info(data)
-      if req.response_header.status != 200
-        @error = data["error"] || req.inspect
-      end
-      yield data
-    end
-    req.errback do 
-      @logger.warn(["Query failed", params, req, req.response])
-      yield({ "error" => req.response })
-    end
-  end # def search
-end # class LogStash::Web::ElasticSearch