logstash-input-acquia 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a840b28e80cad39b49e44b7c31ddec7c6c907b3f
-  data.tar.gz: f04c3151560fb3205feb29e7cb811d4ecbaf4714
+  metadata.gz: cf2af58162eb4692f33361b43f54e8849bed8bc8
+  data.tar.gz: b349c5c34610606663d7197525fc30b026be39ae
 SHA512:
-  metadata.gz: 3ea75ea910df60a1b122a6748a66d23e674b22a60c24804119c6127eaa4acaabafe5c0a5832131111891ea6f594e179ffcd587caffc3834dd1d358616c0faeaa
-  data.tar.gz: 4795ffdddab97f9c60cda2bf47f48bb1e7c502b70e10b12233fa19415d3def0af994f15401ee1447c62bfa526a99b71122b54c8fdb2f8d7d99070925a0548535
+  metadata.gz: 9b137ea299ffb05121af07f209729f9d644a1b24747ebfa2ab47b892aff7693df79bdb9a4e5e0ceaff2b1794b14b4fb5bf88040ff609d7cf79e4c858c814a87b
+  data.tar.gz: 28f5c4382d72814667920254fe6cff7035ab621d1ed457e47e6b2f2c42c1ebd7cf1536cb2ce5bab380539a4431e934e6a9426206dd58a4deb0753968cd7eee02

data/Rakefile

@@ -0,0 +1,29 @@
+$:.push File.join(File.dirname(__FILE__), 'lib')
+
+require 'logstash/inputs/acquia/version'
+
+def current_gems
+  Dir["pkg/logstash-input-acquia-*.gem"]
+end
+
+namespace :gem do
+  desc 'Build gem'
+  task :build do
+    mkdir 'pkg' unless File.exist? 'pkg'
+    sh *%w{gem build logstash-input-acquia.gemspec}
+    Dir['*.gem'].each do |gem|
+      mv gem, "pkg/#{gem}"
+    end
+  end
+
+  desc 'Deploy gems to rubygems'
+  task :deploy => ['gem:build'] do
+    current_gems.each do |gem|
+      sh *%W{gem push #{gem}}
+    end
+    if File.exist? '.git'
+      sh *%W{git tag #{LogStash::Inputs::Acquia::VERSION}}
+      sh *%W{git push origin tag #{LogStash::Inputs::Acquia::VERSION}}
+    end
+  end
+end

data/lib/logstash/inputs/acquia.rb

@@ -37,7 +37,7 @@ class LogStash::Inputs::Acquia < LogStash::Inputs::Base
       @streams.each do |env, stream|
         stream.each_log do |log|
           # p log
-          queue << generate_event(env, log)
+          queue << decorate(generate_event(env, log))
         end
       end
     end
@@ -52,16 +52,19 @@ class LogStash::Inputs::Acquia < LogStash::Inputs::Base
 
   private
   def generate_event(env, log)
-    # Remove useless cruft.
+    # Remove useless API cruft.
     log.delete 'cmd'
+
     # Save the environment this message is coming from.
     log['acquia'] = {
         'site' => @site.name,
         'environment' => env,
     }
+
     # Rename some of Acquia's parameters to more relevant Logstash names.
     log['host'] = log.delete('server')
     log['message'] = log.delete('text')
+
     # Trim off duplicated request id if Acquia has already provided it
     # separately.
     if log['request_id']
@@ -71,8 +74,20 @@ class LogStash::Inputs::Acquia < LogStash::Inputs::Base
       end
     end
 
-    log['@timestamp'] = Time.parse(log.delete('disp_time') + ' +0000').iso8601
+    timestamp = log.delete('disp_time')
+    if timestamp
+      begin
+        log['@timestamp'] = Time.parse(timestamp + ' +0000').iso8601
+      rescue ArgumentError
+        # Not a valid timestamp. Oh well. Clean up, just in case.
+        log.delete '@timestamp'
+      end
+    end
 
     LogStash::Event.new(log)
   end
 end
+
+# Required afterwards so that the inheritance tree has already been built
+# correctly.
+require 'logstash/inputs/acquia/version'

data/lib/logstash/inputs/acquia/version.rb

@@ -0,0 +1,7 @@
+module LogStash
+  module Inputs
+    class Acquia
+      VERSION = '1.4.0'
+    end
+  end
+end

data/logstash-input-acquia.gemspec

@@ -1,7 +1,10 @@
+$:.push File.join(File.dirname(__FILE__), 'lib')
+
+require 'logstash/inputs/acquia/version'
 
 Gem::Specification.new do |s|
   s.name             = 'logstash-input-acquia'
-  s.version          = '1.3.0'
+  s.version          = LogStash::Inputs::Acquia::VERSION
   s.licenses         = ['MIT']
   s.summary          = 'Logstash Input plugin that streams logs from Acquia Cloud'
   s.description      = 'This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-acquia
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Equiem
@@ -98,6 +98,7 @@ files:
 - LICENSE
 - Rakefile
 - lib/logstash/inputs/acquia.rb
+- lib/logstash/inputs/acquia/version.rb
 - logstash-input-acquia.gemspec
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses: