logstash-output-picsv 1.0.5 → 1.0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fe57ac88a14e3ed8becf6f750c9f9708c3aeb38
-  data.tar.gz: bb239e83f2e5c3dd4915ab668fb4299b19d26a54
+  metadata.gz: ea2d0b9ef166adb04ad2572ba4c19bca0ff4c84f
+  data.tar.gz: 1c62bdb5f4e5eabf4b7219ec67ad2e0389aa2b6b
 SHA512:
-  metadata.gz: 1a0259c8796a3180d6c9c757c19ae7abbd9eeeb27bf75f038f167d245197d6ef72698a3ad2ca6891344156a07aebcb824252a9546e1bf1aa83d11a580feaf5fc
-  data.tar.gz: bdcc0729fed0edd80b5f825a910d49a50b79b91e29c3a53f5985644c1542eb056f903cd7f1041db5a2b93104c4eec5dc2f69a8cb14ad942650196e681893b825
+  metadata.gz: 47c3a827a8136846799b4a4c08cc58deedc8dcc4b020b861da3aca456cceb0c194a1409829320d195c52e1c36f83ce90c8a0489928a8d3de7a8d7b1479f31367
+  data.tar.gz: 2e4e842ba559e6ba29264b8c036c58cb88d2532715f1ce24fa7bbbc86a2d8e7187b15d07917a40767f7889af01199e666b6eb12ea71035dfc7c50a9a2bcfe5d4

data/Gemfile

@@ -1,3 +1,3 @@
 source 'https://rubygems.org'
 gemspec
-gem "logstash", :github => "elastic/logstash", :branch => "2.4"
+# gem "logstash", :github => "elastic/logstash", :branch => "2.4"

data/lib/logstash/outputs/picsv.rb

@@ -1,28 +1,29 @@
 ############################################                                    
 #                                                                               
-# picsv                               
+# PICSV                               
 #                                                                               
 # Logstash mediation output for IOA PI
 #                                                                               
 # Version 030815.1 Robert Mckeown
-# Version 030815.2 Jim Ray                                              
+# Version 030815.9 Jim Ray                                              
 #                                                                               
 ############################################     
+# encoding: utf-8
 
-require "csv"
-require "logstash/namespace"
 require "logstash/outputs/file"
+require "logstash/namespace"
+require "csv"
 require 'java' # for the java data format stuff
 
-# SCACSV - based upon original Logstash CSV output.
+# PICSV - based upon original Logstash CSV output.
 # 
 # Write events to disk in CSV format
 # Write a PI header as the first line in the file
 # Name file per PI convention, based upon first and last timestamps encountered 
 
-class LogStash::Outputs::SCACSV < LogStash::Outputs::File
-
-  config_name "scacsv"
+class LogStash::Outputs::PICSV < LogStash::Outputs::File
+ 
+  config_name "picsv"
   milestone 1
 
   # The field names from the event that should be written to the CSV file.
@@ -105,15 +106,15 @@ class LogStash::Outputs::SCACSV < LogStash::Outputs::File
   private
   def flushWatchdog(delay)
     begin
-      @logger.debug("SCACSVFlushWatchdog - Last output time = " + @lastOutputTime.to_s)
+      @logger.debug("PICSVFlushWatchdog - Last output time = " + @lastOutputTime.to_s)
       while true do
-        @logger.debug("SCACSVFlushWatchdog - Time.now = " + Time.now.to_s + " $lastOutputTime=" + @lastOutputTime.to_s + " delay=" + delay.to_s)
+        @logger.debug("PICSVFlushWatchdog - Time.now = " + Time.now.to_s + " $lastOutputTime=" + @lastOutputTime.to_s + " delay=" + delay.to_s)
 
         if ( (Time.now.to_i >= (@lastOutputTime.to_i + delay.to_i)) and (@recordCount > 0)) then
-          @logger.debug("SCACSVFlushWatchdog - closeAndRenameCurrentFile")
+          @logger.debug("PICSVFlushWatchdog - closeAndRenameCurrentFile")
           closeAndRenameCurrentFile
         end
-        @logger.debug("SCACSVFlushWatchdog - Sleeping")
+        @logger.debug("PICSVFlushWatchdog - Sleeping")
         sleep 1
       end
     end
@@ -123,7 +124,7 @@ class LogStash::Outputs::SCACSV < LogStash::Outputs::File
   def receive(event)
     return unless output?(event)
 
-    @logger.debug("in SCACSV receive")
+    @logger.debug("in PICSV receive")
 
     if (event['SCAWindowMarker']) 
       # just eat the marker - don't output it
@@ -140,7 +141,7 @@ class LogStash::Outputs::SCACSV < LogStash::Outputs::File
 
       @formattedPath = event.sprintf(@path)
       fd = open(@formattedPath)
-      @logger.debug("SCACSVreceive - after opening fd=" + fd.to_s)
+      @logger.debug("PICSVreceive - after opening fd=" + fd.to_s)
 
       if @recordCount == 0
         # output header on first line - note, need a minimum of one record for sensible output
@@ -243,7 +244,7 @@ class LogStash::Outputs::SCACSV < LogStash::Outputs::File
     begin
 
       if timestamp.nil? then
-        @logger.debug("SCACSV " + missingString + " for  #{group}")
+        @logger.debug("PICSV " + missingString + " for  #{group}")
       elsif timestamp_output_format == "epoch" then  
         outputString = timestamp.to_s  
       elsif timestamp_output_format == "" then
@@ -353,7 +354,7 @@ class LogStash::Outputs::SCACSV < LogStash::Outputs::File
   end
 
   def teardown
-     @logger.debug("SCACSV - Teardown: closing files")
+     @logger.debug("PICSV - Teardown: closing files")
 
     Thread.kill(@timerThread)
     closeAndRenameCurrentFile
@@ -361,5 +362,5 @@ class LogStash::Outputs::SCACSV < LogStash::Outputs::File
     finished
   end
 
-end # class LogStash::Outputs::SCACSV
+end # class LogStash::Outputs::PICSV
 

data/logstash-output-picsv.gemspec

@@ -1,17 +1,19 @@
 Gem::Specification.new do |s|
-  s.name = 'logstash-output-picsv'
-  s.version         = "1.0.5"
-  s.licenses = ["Apache-2.0"]
-  s.summary = "Receives a stream of events and outputs files meeting the csv format for IBM Operation Analytics Predictive Insights"
+  s.name 			= 'logstash-output-picsv'
+  s.version         = "1.0.5.1" # 0921@08:05AM
+  s.licenses 		= ["Apache-2.0"]
+  s.summary 		= "Receives a stream of events and outputs files meeting the csv format for IBM Operation Analytics Predictive Insights"
   # Need to validate 1.5 standalone gemfile compatibility; gemfile exists!
-  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"
-  s.authors = ["ORIG:Robert Mckeown, Update:Jim Ray"]
-  s.email = "raygj@us.ibm.com"
-  s.homepage = "https://github.com/raygj/logstash-output-picsv/README.md"
-  s.require_paths = ["lib"]
+  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"
+  s.authors 		= ["ORIG:Robert Mckeown, Update:Jim Ray"]
+  s.email 			= "raygj@us.ibm.com"
+  s.homepage 		= "https://github.com/raygj/logstash-output-picsv/README.md"
+  s.require_paths 	= ["lib"]
 
   # Files
-  s.files = `git ls-files`.split($\)
+  # s.files = `git ls-files`.split($\) # original line
+  s.files = Dir['lib/**/*','spec/**/*','vendor/**/*','*.gemspec','*.md','CONTRIBUTORS','Gemfile','LICENSE','NOTICE.TXT']
+  
   # Tests
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
 
@@ -19,7 +21,9 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "output" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core", ">= 1.5.0", "< 3.0.0"
-  s.add_runtime_dependency "logstash-codec-plain", "~> 0"
-  s.add_development_dependency "logstash-devutils", "~> 0"
-end
+  s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
+  s.add_runtime_dependency "logstash-codec-plain"
+  s.add_runtime_dependency "logstash-output-file"
+  s.add_development_dependency "logstash-devutils"
+  
+end

data/spec/outputs/picsv_spec.rb

@@ -1,11 +1,13 @@
+# encoding: utf-8
+require "logstash/outputs/picsv"
 require "logstash/devutils/rspec/spec_helper"
-require "logstash/outputs/base" # changed from /example to /base
 require "logstash/codecs/plain"
 require "logstash/event"
+require "logstash/outputs/file"
 
-describe LogStash::Outputs::Example do
+describe LogStash::Outputs::PICSV do
   let(:sample_event) { LogStash::Event.new }
-  let(:output) { LogStash::Outputs::Example.new }
+  let(:output) { LogStash::Outputs::PICSV.new }
 
   before do
     output.register
@@ -18,4 +20,4 @@ describe LogStash::Outputs::Example do
       expect(subject).to eq("Event received")
     end
   end
-end
+end

metadata

@@ -1,39 +1,39 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-picsv
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.5.1
 platform: ruby
 authors:
 - ORIG:Robert Mckeown, Update:Jim Ray
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-09-16 00:00:00.000000000 Z
+date: 2016-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
-    - - "<"
+        version: '1.60'
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 3.0.0
-  name: logstash-core
+        version: '2.99'
+  name: logstash-core-plugin-api
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
-    - - "<"
+        version: '1.60'
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '2.99'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   name: logstash-codec-plain
@@ -41,13 +41,27 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: logstash-output-file
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   name: logstash-devutils
@@ -55,7 +69,7 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 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
@@ -64,10 +78,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
 - Gemfile
 - README.md
-- Rakefile
 - lib/logstash/outputs/picsv.rb
 - logstash-output-picsv.gemspec
 - spec/outputs/picsv_spec.rb

data/.gitignore

@@ -1,2 +0,0 @@
-
-.DS_Store

data/Rakefile

@@ -1 +0,0 @@
-require "logstash/devutils/rake"