logstash-input-openwhisk 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9db13f2d4ca718f1a1535f0eddad8e2c85d91075
-  data.tar.gz: e7c52b01737a328cb0da22e0181ecd5e6ac8cc8a
+  metadata.gz: d6085b13d1d676f730d1a6d122fdc692ed18956f
+  data.tar.gz: ef9b033a0d39f22c64a02d892fea5383c55a4808
 SHA512:
-  metadata.gz: 64caf68777249d6c82830327f9e8d2a171d7cfd0db9f158816729e07973e53ea169953921b7055de2cb6a1c507e5c308979fca9e8323bc4b12bb9d87b17a8541
-  data.tar.gz: c10fa9d69965376eb088b1c41673ccbaf7699e87bc0cf61e9fc88f496b412a4331e652d048d90b9f7650a0e8fcf7a0308588cfe2ccc795e716e03b7a82f10d9e
+  metadata.gz: 2db8d05321809c5c2e833a19fcd7e195da2e8627634240760fb6035ba790a0279ce90d2b53606d32eaddf721df9679ce725809ba2aed2c5444579a80b8658119
+  data.tar.gz: c9f43dd62b3c79fe67c566959d47681fcfad893face804a57ce6b136a29da25dc85d7b7064e572c3d360bfbc440842e81b8f501dfd1e34deee85627b33c0bd38

data/lib/logstash/inputs/openwhisk.rb

@@ -5,6 +5,7 @@ require "logstash/plugin_mixins/http_client"
 require "socket" # for Socket.gethostname
 require "manticore"
 require "rufus/scheduler"
+require 'json'
 
 # This Logstash input plugin allows you to drain OpenWhisk Activation logs, decoding the output into event(s), and
 # send them on their merry way. Using the OpenWhisk platform API, we poll the activation logs API according to the config schedule.
@@ -184,6 +185,7 @@ class LogStash::Inputs::OpenWhisk < LogStash::Inputs::Base
 
       ## ignore results we have previously seen
       if !@activation_ids.include?(activation_id)
+        sanitize(decoded)
         event = @target ? LogStash::Event.new(@target => decoded.to_hash) : decoded
         update_logs_since(decoded.to_hash["end"])
         handle_decoded_event(queue, name, request, response, event, execution_time)
@@ -195,6 +197,15 @@ class LogStash::Inputs::OpenWhisk < LogStash::Inputs::Base
     @activation_ids = activation_ids
   end
 
+  # elastic search cannot handle attributes which change types.
+  # serialise annotations to JSON strings
+  private
+  def sanitize(activation)
+    annotations = activation.get("annotations")
+    annotations.each {|a| a["value"] = a["value"].to_json}
+    activation.set("annotations", annotations)
+  end
+
   # updates the query parameter for the next request
   # based upon the last activation's end time.
   private

data/logstash-input-openwhisk.gemspec

@@ -1,12 +1,12 @@
 Gem::Specification.new do |s|
   s.name        = 'logstash-input-openwhisk'
-  s.version         = '0.1.0'
+  s.version         = '0.1.1'
   s.licenses    = ['Apache License (2.0)']
   s.summary     = "Retrieve OpenWhisk logs with Logstash."
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"
   s.authors     = [ "James Thomas" ]
   s.email       = 'james@jamesthom.as'
-  s.homepage    = "http://www.elastic.co/guide/en/logstash/current/index.html"
+  s.homepage    = "http://github.com/jthomas/logstash-input-openwhisk"
   s.require_paths = ["lib"]
 
   # Files

data/spec/inputs/openwhisk_spec.rb

@@ -428,7 +428,7 @@ describe LogStash::Inputs::OpenWhisk do
     end
 
     describe "a valid request and decoded response" do
-      let(:payload) { [{"start" => 1476818509288, "end" => 1476818509888, "activationId" => "some_id"}] }
+      let(:payload) { [{"start" => 1476818509288, "end" => 1476818509888, "activationId" => "some_id", "annotations" => []}] }
       let(:opts) { default_opts }
       let(:instance) {
         klass.new(opts)
@@ -496,8 +496,17 @@ describe LogStash::Inputs::OpenWhisk do
         end
       end
 
+      context "with annotations" do
+        let(:annotations) { [{"key" => "a", "value" => { "child": "val" } }, {"key" => "b", "value" => "some_string"}] }
+        let(:payload) { [{"start" => 1476818509288, "end" => 1476818509888, "activationId" => "some_id", "annotations" => annotations}] }
+
+        it "should serialise annotations to JSON strings" do
+          expect(event.to_hash["annotations"]).to eql([{"key" => "a", "value" => '{"child":"val"}'}, {"key" => "b", "value" => "\"some_string\""}])
+        end
+      end
+
       context "with multiple activations" do
-        let(:payload) { [{"end" => 1476818509288, "activationId" => "1"},{"end" => 1476818509289, "activationId" => "2"},{"end" => 1476818509287, "activationId" => "3"} ] }
+        let(:payload) { [{"end" => 1476818509288, "activationId" => "1", "annotations" => []},{"end" => 1476818509289, "activationId" => "2", "annotations" => []},{"end" => 1476818509287, "activationId" => "3", "annotations" => []} ] }
 
         it "should update logs since to latest epoch" do
           instance.instance_variable_set("@logs_since", 0)
@@ -509,7 +518,7 @@ describe LogStash::Inputs::OpenWhisk do
       end
 
       context "with previous activations" do
-        let(:payload) { [{"end" => 1476818509288, "activationId" => "some_id"}] }
+        let(:payload) { [{"end" => 1476818509288, "activationId" => "some_id", "annotations" => []}] }
 
         subject(:size) {
           queue.size()

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-openwhisk
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - James Thomas
@@ -160,7 +160,7 @@ files:
 - lib/logstash/inputs/openwhisk.rb
 - logstash-input-openwhisk.gemspec
 - spec/inputs/openwhisk_spec.rb
-homepage: http://www.elastic.co/guide/en/logstash/current/index.html
+homepage: http://github.com/jthomas/logstash-input-openwhisk
 licenses:
 - Apache License (2.0)
 metadata: