logstash-input-perfmon 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 601dbc961227dcfc88ff5824c38e77d07dc3813c
-  data.tar.gz: 40e746091821835a2bd829fd8d7462a51bcbc5ca
+  metadata.gz: da5408d570f346b92be0025f5dd90e4b3f8c507f
+  data.tar.gz: b1fbda74d2668639848521a8d566e4167d64c6d1
 SHA512:
-  metadata.gz: 2f9797ef221c5e1497414437b1c71ee144baf98e24bc02d7192e2ba7544b7a99c68d359849f1bfdda869246ed09a90cb7f97b986c974ecc542d2e178d1d4ecaa
-  data.tar.gz: 0a26c01e5250c0d8be8d0cdb3a4d403a8a8250d1f8e966f5d1e9d3389e8af99d321c0586639066b5da38bc77781b8686b5a3a5da268238287e188a7c98246557
+  metadata.gz: 10590030edf6d9c413b32735bd792109fdb6d4cc4bf7787d0001d33e9714aa76fab9f1aef237fa3af2b351a1f96fe3c4b664568b76b658f22bf9ce8584e2adb4
+  data.tar.gz: 871bea6e2696241047add7160998cf8cc47dbf52a20cc909adc3ba50e6bdd21d6fe847e3f11031c32b7a1db9483a0441be6a5a867d363ec1e7c440c87df05982

data/.travis.yml

@@ -0,0 +1,9 @@
+# TODO: Uncomment when Windows OS is supported by Travis CI.
+# We can only run the integration tests on Windows.
+
+# language: ruby
+#rvm:
+#  - jruby-head
+#  
+#os:
+#  - windows

data/NOTICE.TXT

@@ -0,0 +1,5 @@
+Elasticsearch
+Copyright 2012-2015 Elasticsearch
+
+This product includes software developed by The Apache Software
+Foundation (http://www.apache.org/).

data/README.md

@@ -1,6 +1,6 @@
 # Perfmon Logstash Plugin
 
-This is a plugin for [Logstash](https://github.com/elasticsearch/logstash).
+This is a plugin for [Logstash](https://github.com/elastic/logstash).
 
 It is fully free and fully open source. The license is Apache 2.0, meaning you are pretty much free to use it however you want in whatever way.
 
@@ -15,7 +15,7 @@ git clone https://github.com/NickMRamirez/logstash-input-perfmon.git
 cd logstash-input-perfmon
 jruby -S gem install bundler
 jruby -S bundle install
-jruby -S bundle exec rspec spec
+jruby -S bundle exec rake
 ```
 
 To build the gem:

data/Rakefile

@@ -1 +1,8 @@
-require "logstash/devutils/rake"
+require 'logstash/devutils/rake'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = '--format documentation'
+end
+
+task :default => :spec

data/lib/logstash/inputs/perfmon.rb

@@ -84,11 +84,19 @@ class LogStash::Inputs::Perfmon < LogStash::Inputs::Base
     end
   end 
 
-  # Cleans up any resources
+  # Cleans up any resources, called when Ctrl+C used
   def teardown
+    @logger.debug("Calling teardown on logstash-input-perfmon")
     @typeperf.stop_monitor
     @logger.debug("Stopped the perfmon monitor")
     finished
   end
+  
+  # Manual way to stop the plugin
+  def stop
+    @logger.debug("Calling stop on logstash-input-perfmon")
+    @typeperf.stop_monitor
+    @logger.debug("Stopped the perfmon monitor")
+  end
 
 end

data/lib/logstash/inputs/perfmon_proc_getter.rb

@@ -1,3 +1,5 @@
+require 'open3'
+
 class PerfmonProcGetter
   attr_reader :pid
   
@@ -12,17 +14,19 @@ class PerfmonProcGetter
   # [output_queue] The queue to add each new message to
   def start_process(counters, interval, output_queue)
     cmd = get_typeperf_command(counters, interval)
-	  
-    IO.popen(cmd) do |f|
-      @pid = f.pid
-
-      f.each do |line| 
-        next if counters.any? { |counter| line.include? counter } # don't show lines that contain headers
-        line.gsub!('"', '') # remove quotes
-        line.strip!
-        output_queue << line
+	
+	Open3.popen3(cmd) do |w, r, e, thr|
+      while line = r.gets
+	    if @pid.nil?
+	      @pid = thr.pid
+		end
+      
+	    next if counters.any? { |counter| line.include? counter } # don't show lines that contain headers
+	    line.gsub!('"', '') # remove quotes
+	    line.strip!
+	    output_queue << line
       end
-    end
+	end
   end
   
   # Kills the typeperf process

data/lib/logstash/inputs/typeperf_wrapper.rb

@@ -1,4 +1,3 @@
-require 'win32/process'
 require_relative 'perfmon_proc_getter'
 
 # Wraps the typeperf command-line tool, used to get 

data/logstash-input-perfmon.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-input-perfmon'
-  s.version = '0.1.3'
+  s.version = '0.1.4'
   s.licenses = ['Apache License (2.0)']
   s.summary = "Logstash input for Windows Performance Monitor"
   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. Logstash input for Windows Performance Monitor metrics."
@@ -21,7 +21,6 @@ Gem::Specification.new do |s|
   # Gem dependencies
   s.add_runtime_dependency "logstash-core", '>= 1.4.0', '< 2.0.0'
   s.add_runtime_dependency 'logstash-codec-plain'
-  s.add_runtime_dependency 'win32-process'
 
   s.add_development_dependency 'logstash-devutils'
 end

data/spec/inputs/perfmon_spec.rb

@@ -64,7 +64,7 @@ describe 'IntegrationTests' do
 		
 		expect(my_queue).not_to be_empty
 		
-		plugin.teardown
+		plugin.stop
 	  end
 	end
 	

metadata

@@ -1,17 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-perfmon
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Nick Ramirez
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-10 00:00:00.000000000 Z
+date: 2015-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: logstash-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -20,8 +19,9 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
-  type: :runtime
+  name: logstash-core
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -31,61 +31,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: logstash-codec-plain
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  name: logstash-codec-plain
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: win32-process
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: logstash-devutils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: logstash-devutils
   prerelease: false
+  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. Logstash input for Windows Performance Monitor metrics.
+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. Logstash input for Windows Performance Monitor metrics.
 email: nickram44@hotmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTORS
 - DEVELOPER.md
 - Gemfile
 - LICENSE
+- NOTICE.TXT
 - README.md
 - Rakefile
 - lib/logstash/inputs/perfmon.rb
@@ -101,7 +87,7 @@ licenses:
 metadata:
   logstash_plugin: 'true'
   logstash_group: input
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -116,9 +102,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.4.8
+signing_key:
 specification_version: 4
 summary: Logstash input for Windows Performance Monitor
 test_files: