logstash-lite 0.2.20101120021802 → 0.2.20101120024757

data/lib/logstash/event.rb

@@ -79,10 +79,12 @@ module LogStash; class Event
 
     # Append all fields
     event.fields.each do |name, value|
-      if event.fields.include?(name)
-        event.fields[name] |= value
+      if self.fields.include?(name)
+        puts "Merging field #{name}"
+        self.fields[name] |= value
       else
-        event.fields[name] = value
+        puts "Setting field #{name}"
+        self.fields[name] = value
       end
     end # event.fields.each
   end

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

@@ -46,6 +46,7 @@ class LogStash::Web::ElasticSearch
       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|

data/lib/logstash/web/public/js/logstash.js

@@ -108,7 +108,6 @@
     $(result_row_selector).live("click", function() {
       var data = eval($("td.message", this).data("full"));
 
-      console.log(event);
       /* Apply template to the dialog */
       var query = $("#query").val().replace(/^\s+|\s+$/g, "")
       var sanitize = function(str) {
@@ -121,10 +120,12 @@
       var template = $.template("inspector",
         "<li>" +
           "<b>(${type}) ${field}</b>:" +
-          "<a href='/search?q=" + query + " ${escape(field)}:${$item.sanitize(value)}'" +
-          "   data-field='${escape(field)}' data-value='${$item.sanitize(value)}'>" +
-            "${value}" +
-          "</a>" +
+          "{{each(idx, val) value}}" +
+            "<a href='/search?q=" + query + " ${escape(field)}:${$item.sanitize(val)}'" +
+            "   data-field='${escape(field)}' data-value='${$item.sanitize(val)}'>" +
+              "${val}" +
+            "</a>, " +
+          "{{/each}}" +
         "</li>");
 
       /* TODO(sissel): recurse through the data */
@@ -134,12 +135,19 @@
         if (/^[, ]*$/.test(value)) {
           continue; /* Skip empty data fields */
         }
+        if (!(value instanceof Array)) {
+          value = [value];
+        }
         fields.push( { type: "field", field: i, value: value })
       }
 
       for (var i in data._source) {
         if (i == "@fields") continue;
         var value = data._source[i]
+        if (!(value instanceof Array)) {
+          value = [value];
+        }
+
         if (i.charAt(0) == "@") { /* metadata */
           fields.push( { type: "metadata", field: i, value: value });
         } else { /* data */
@@ -154,7 +162,11 @@
         if (i == "_source") {
           continue; /* already processed this one */
         }
-        fields.push( { type: "metadata", field: i, value: data[i] })
+        value = data[i]
+        if (!(value instanceof Array)) {
+          value = [value];
+        }
+        fields.push( { type: "metadata", field: i, value: value })
       }
 
       fields.sort(function(a, b) {

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: logstash-lite
 version: !ruby/object:Gem::Version 
-  hash: 40202240043587
+  hash: 40202240049533
   prerelease: false
   segments: 
   - 0
   - 2
-  - 20101120021802
-  version: 0.2.20101120021802
+  - 20101120024757
+  version: 0.2.20101120024757
 platform: ruby
 authors: 
 - Jordan Sissel