logstash-input-perfmon 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 912cecdb5d9d7caa1b6010d2c5d544bbb258ca52
-  data.tar.gz: 180877863382a2cc1f719e08f53ef5b6e9b8d67e
+  metadata.gz: a02d8e9c2007451db119daba0b7cc49edd7d4d1b
+  data.tar.gz: 3f883c2fc4e5a85fa1c777f96bb4329aa108d42c
 SHA512:
-  metadata.gz: a38105130ea4f3e34ef586b88274febc153e95590996d0c096ea35bc25888e84d638c3428c611934acea4e0ae7673c6df9012b29311b950a57cf57c4f6963d80
-  data.tar.gz: 8dc370b3de33743434a8c80d9f01ac9913b61b2b007e83a7f06bf7e3bd21d2c432e6f6d46fb319c371822ab588dd7fff2b673a748a357aca742c0f2c11a29083
+  metadata.gz: e30516a092a4e498b3e90289dfe69cea0343f966bed7d1a9eb0e6447f46e00a20e421a0859553a74a4f4cbe85527ebab4adb2d806725d1ea9e9eb6b0c51d26e8
+  data.tar.gz: f642dc8d47e9573d32e59003aeb6c71e24745a533a1abe30c9888e3a4f5d733047acd37566f45e28022587d875e82253d54fa95b2b4b54556f0db149c09960a9

data/README.md

@@ -13,14 +13,13 @@ To run the tests (be sure that JRuby is installed prior):
 ```
 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
 ```
 
 To build the gem:
 ```
-git clone https://github.com/NickMRamirez/logstash-input-perfmon.git
-cd logstash-input-perfmon
 gem build logstash-input-perfmon.gemspec
 ```
 
@@ -56,6 +55,10 @@ output {
   }
 }
 ```
+Run logstash:
+```
+logstash -f C:\path\to\conf
+```
 
 This configuration will produce output like:
 ```json
@@ -63,6 +66,7 @@ This configuration will produce output like:
   "message":"06/05/2015 15:40:46.999,0.781236,7.032877,6.249891",
   "@version":"1",
   "@timestamp":"2015-06-05T19:40:48.468Z",
+  "host":"Webserver1",
   "Occurred":"06/05/2015 15:40:46.999",
   "PrivilegedTime":0.781236,
   "ProcessorTime":7.032877,
@@ -70,7 +74,14 @@ This configuration will produce output like:
 }
 ```
 
-Run logstash:
+## Troubleshooting
+
+If you get bundler errors having to do with not being able to install a gem, such as:
+```
+You have requested:
+  logstash-devutil >= 0
+  
+The bundle currently has logstash-devutil locked at 0.0.13.
+Try running 'bundle update logstash-devutils'
 ```
-    logstash -f C:\path\to\conf
-```
+The JRuby -S parameter looks at your PATH and it may be defaulting to another version of Ruby. 

data/lib/logstash/inputs/perfmon.rb

@@ -27,7 +27,7 @@ require_relative "typeperf_wrapper"
 #     }
 #   }
 class LogStash::Inputs::Perfmon < LogStash::Inputs::Base
-  attr_reader :counters, :interval
+  attr_reader :counters, :interval, :host
   
   config_name "perfmon"
 
@@ -43,17 +43,28 @@ class LogStash::Inputs::Perfmon < LogStash::Inputs::Base
   # Sets the frequency, in seconds, at which to collect perfmon metrics
   config :interval, :validate => :number, :required => false, :default => 10
   
+  # Identifies the server being monitored. Defaults to hostname, but can be overriden.
+  # [source,ruby]
+  #     input {
+  #       perfmon {
+  #         interval => 10
+  #         counters => ["\Processor(_Total)\% Privileged Time"],
+  #         host => "webserver1"
+  #       }
+  #     }
+  config :host, :required => false, :default => Socket.gethostname
+  
   #------------Public Methods--------------------
   public
   
   # Registers the plugin with logstash
   def register
-    @host = Socket.gethostname
     @typeperf = TypeperfWrapper.new(PerfmonProcGetter.new, @interval)
     @counters.each { |counter| @typeperf.add_counter(counter) }
   end
 
   # Runs the perf monitor and monitors its output
+  # [queue] The queue to add new events to
   def run(queue)
     @typeperf.start_monitor
 	
@@ -64,6 +75,9 @@ class LogStash::Inputs::Perfmon < LogStash::Inputs::Base
 
       @codec.decode(data) do |event|
         decorate(event)
+		
+        event['host'] = @host
+		
         queue << event
         @logger.debug("Added event to queue: #{event}")
       end

data/lib/logstash/inputs/perfmon_proc_getter.rb

@@ -18,8 +18,8 @@ class PerfmonProcGetter
 
       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!
+        line.gsub!('"', '') # remove quotes
+        line.strip!
         output_queue << line
       end
     end

data/lib/logstash/inputs/typeperf_wrapper.rb

@@ -53,8 +53,8 @@ class TypeperfWrapper
   private
   
   def open_thread_and_do_work
-    @t1 = Thread.new do
-	  @perfmon_proc_getter.start_process(@counters, @interval, @msg_queue)
+    Thread.new do
+      @perfmon_proc_getter.start_process(@counters, @interval, @msg_queue)
     end
 	
     @perfmon_proc_getter.wait_for_process_to_start

data/logstash-input-perfmon.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-input-perfmon'
-  s.version = '0.1.1'
+  s.version = '0.1.2'
   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."

data/spec/inputs/perfmon_spec.rb

@@ -7,14 +7,41 @@ describe 'IntegrationTests' do
     subject(:plugin) do
 	  LogStash::Inputs::Perfmon.new(
 		  "interval" => 1,
-		  "counters" => ["\\processor(_total)\\% processor time"]
+		  "counters" => ["\\processor(_total)\\% processor time"],
+		  "host" => "webserver1"
 		)
 	end
   
     describe 'initialize' do
-      it 'assigns counters and interval' do
+      it 'assigns counters' do
 		expect(plugin.counters).to eq ["\\processor(_total)\\% processor time"]
-		expect(plugin.interval).to eq 1
+	  end
+	  
+	  it 'assigns interval' do
+        expect(plugin.interval).to eq 1
+	  end
+	  
+	  it 'assigns hostname to host when host is not set' do
+	    my_plugin = LogStash::Inputs::Perfmon.new(
+		  "interval" => 1,
+		  "counters" => ["\\processor(_total)\\% processor time"]
+		)
+		
+		my_plugin.register
+		
+		expect(my_plugin.host).to eq Socket.gethostname
+	  end
+	  
+	  it 'overrides hostname as host when host is set' do
+	    my_plugin = LogStash::Inputs::Perfmon.new(
+		  "interval" => 1,
+		  "counters" => ["\\processor(_total)\\% processor time"],
+		  "host" => "webserver1"
+		)
+		
+		my_plugin.register
+		
+		expect(my_plugin.host).to eq 'webserver1'
 	  end
     end
 	

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-perfmon
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Nick Ramirez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-06 00:00:00.000000000 Z
+date: 2015-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core