logstash-input-perfmon 0.1.6 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68cc247a345a96ce083538b3e7f661ab7a81b151
-  data.tar.gz: f27f18efd369769692d7ec7f3b0b1856eb497a70
+  metadata.gz: 1fd605ad5c8aa07747534a29de79f22dcecd354e
+  data.tar.gz: c68130460a5ae8bde0ef799421f10345ac9c3ad2
 SHA512:
-  metadata.gz: dc35795a90643171fbd743d2691eb59d0cfa51c259e8e3af5acc64fa23c6cce2de03d8c5e08c8feebf25a6df52863abfbc9675605219fc9ca36007f14d56f176
-  data.tar.gz: 4a91279ddd0072c9d445281bff0728c1df4762b414b60285ef1ab2ebc08dc58691a5a03465ff1aa3d6e3b3493fba95a708cb578c8570c6b8bacc782a762985e9
+  metadata.gz: 30800a921771e02ac393e8e443b51500373e68dd053d5c1471016ea2a697f0e4e0ef7cfef6b3877231c9a6b8efdc09be8efe937c80d4ccab10519007179ddff4
+  data.tar.gz: 4927766d9df8adfa11d4ed9c9909fc222028d99cff613d32f3030deb536448cb64fbbe4601b583e4c37819d711dbb2e6fda17d8b043dcc5379a7a5cf4dfeddba

data/.github/CONTRIBUTING.md

@@ -0,0 +1,65 @@
+# Contributing to Logstash
+
+All contributions are welcome: ideas, patches, documentation, bug reports,
+complaints, etc!
+
+Programming is not a required skill, and there are many ways to help out!
+It is more important to us that you are able to contribute.
+
+That said, some basic guidelines, which you are free to ignore :)
+
+## Want to learn?
+
+Want to lurk about and see what others are doing with Logstash? 
+
+* The irc channel (#logstash on irc.freenode.org) is a good place for this
+* The [forum](https://discuss.elastic.co/c/logstash) is also
+  great for learning from others.
+
+## Got Questions?
+
+Have a problem you want Logstash to solve for you? 
+
+* You can ask a question in the [forum](https://discuss.elastic.co/c/logstash)
+* Alternately, you are welcome to join the IRC channel #logstash on
+irc.freenode.org and ask for help there!
+
+## Have an Idea or Feature Request?
+
+* File a ticket on [GitHub](https://github.com/elastic/logstash/issues). Please remember that GitHub is used only for issues and feature requests. If you have a general question, the [forum](https://discuss.elastic.co/c/logstash) or IRC would be the best place to ask.
+
+## Something Not Working? Found a Bug?
+
+If you think you found a bug, it probably is a bug.
+
+* If it is a general Logstash or a pipeline issue, file it in [Logstash GitHub](https://github.com/elasticsearch/logstash/issues)
+* If it is specific to a plugin, please file it in the respective repository under [logstash-plugins](https://github.com/logstash-plugins)
+* or ask the [forum](https://discuss.elastic.co/c/logstash).
+
+# Contributing Documentation and Code Changes
+
+If you have a bugfix or new feature that you would like to contribute to
+logstash, and you think it will take more than a few minutes to produce the fix
+(ie; write code), it is worth discussing the change with the Logstash users and developers first! You can reach us via [GitHub](https://github.com/elastic/logstash/issues), the [forum](https://discuss.elastic.co/c/logstash), or via IRC (#logstash on freenode irc)
+Please note that Pull Requests without tests will not be merged. If you would like to contribute but do not have experience with writing tests, please ping us on IRC/forum or create a PR and ask our help.
+
+## Contributing to plugins
+
+Check our [documentation](https://www.elastic.co/guide/en/logstash/current/contributing-to-logstash.html) on how to contribute to plugins or write your own! It is super easy!
+
+## Contribution Steps
+
+1. Test your changes! [Run](https://github.com/elastic/logstash#testing) the test suite
+2. Please make sure you have signed our [Contributor License
+   Agreement](https://www.elastic.co/contributor-agreement/). We are not
+   asking you to assign copyright to us, but to give us the right to distribute
+   your code without restriction. We ask this of all contributors in order to
+   assure our users of the origin and continuing existence of the code. You
+   only need to sign the CLA once.
+3. Send a pull request! Push your changes to your fork of the repository and
+   [submit a pull
+   request](https://help.github.com/articles/using-pull-requests). In the pull
+   request, describe what your changes do and mention any bugs/issues related
+   to the pull request.
+
+

data/.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,9 @@
+Please post all product and debugging questions on our [forum](https://discuss.elastic.co/c/logstash). Your questions will reach our wider community members there, and if we confirm that there is a bug, then we can open a new issue here.
+
+For all general issues, please provide the following details for fast resolution:
+
+- Version:
+- Operating System:
+- Config File (if you have sensitive info, please remove it):
+- Sample Data:
+- Steps to Reproduce:

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1 @@
+Thanks for contributing to Logstash! If you haven't already signed our CLA, here's a handy link: https://www.elastic.co/contributor-agreement/

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+## 2.0.0
+ - Plugins were updated to follow the new shutdown semantic, this mainly allows Logstash to instruct input plugins to terminate gracefully, 
+   instead of using Thread.raise on the plugins' threads. Ref: https://github.com/elastic/logstash/pull/3895
+ - Dependency on logstash-core update to 2.0
+

data/Gemfile

@@ -1,6 +1,2 @@
 source 'https://rubygems.org'
 gemspec
-
-gem 'logstash-core', '~> 2.1'
-gem 'logstash-codec-plain', '~> 2.0'
-gem 'logstash-devutils', '~> 0'

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012–2015 Elasticsearch <http://www.elastic.co>
+Copyright (c) 2012–2016 Elasticsearch <http://www.elastic.co>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/README.md

@@ -1,5 +1,8 @@
 # Perfmon Logstash Plugin
 
+[![Build
+Status](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Inputs/job/logstash-plugin-input-perfmon-unit/badge/icon)](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Inputs/job/logstash-plugin-input-perfmon-unit/)
+
 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.
@@ -11,7 +14,7 @@ This plugin collects the same sort of counters by using the command-line tool [T
 
 To run the tests (be sure that JRuby is installed prior):
 ```
-git clone https://github.com/NickMRamirez/logstash-input-perfmon.git
+git clone https://github.com/logstash-plugins/logstash-input-perfmon.git
 cd logstash-input-perfmon
 jruby -S gem install bundler
 jruby -S bundle install
@@ -23,16 +26,21 @@ To build the gem:
 gem build logstash-input-perfmon.gemspec
 ```
 
-To install the gem to logstash:
+To install the gem to logstash (note the forward slashes in the path when using the `install` command):
 ```
 cd path\to\logstash\bin
-plugin install path\to\gem
+logstash-plugin install C:/path/to/gem
 ```
 
-If you aren't building the gem yourself, you can install it directly from rubygems.org:
+If you aren't building the gem yourself, you can install it directly from [rubygems.org](https://rubygems.org/gems/logstash-input-perfmon):
 ```
-cd path\to\logstash\bin
-plugin install logstash-input-perfmon
+cd path\to\logstash
+
+# Logstash 2.3 and higher
+bin\logstash-plugin install --no-verify logstash-input-perfmon
+
+# Prior to Logstash 2.3
+bin\plugin install --no-verify logstash-input-perfmon
 ```
 	
 Create a configuration file. The following collects three metrics every ten seconds:
@@ -56,11 +64,10 @@ filter {
 }
 
 output {
-  file {
-	path => "C:\perfmon_output.txt"
-  }
+  stdout {}
 }
 ```
+
 Run logstash:
 ```
 logstash -f C:\path\to\conf

data/lib/logstash/inputs/perfmon.rb

@@ -76,7 +76,7 @@ class LogStash::Inputs::Perfmon < LogStash::Inputs::Base
       @codec.decode(data) do |event|
         decorate(event)
         
-        event['host'] = @host
+        event.set('host', @host)
         
         queue << event
         @logger.debug("Added event to queue: #{event}")

data/logstash-input-perfmon.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-input-perfmon'
-  s.version = '0.1.6'
+  s.version = '1.0.0'
   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."
@@ -19,8 +19,8 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "input" }
 
   # Gem dependencies
-  s.add_runtime_dependency 'logstash-core', '~> 2.1'
-  s.add_runtime_dependency 'logstash-codec-plain', '~> 2.0'
+  s.add_runtime_dependency 'logstash-core', '>= 5.0.0'
+  s.add_runtime_dependency 'logstash-codec-plain'
 
-  s.add_development_dependency 'logstash-devutils', '~> 0'
+  s.add_development_dependency 'logstash-devutils'
 end

data/spec/inputs/typeperf_wrapper_spec.rb

@@ -4,10 +4,14 @@ require_relative '../../lib/logstash/inputs/typeperf_wrapper.rb'
 
 class MockPerfmonProcGetter
   def start_process(counters, interval, output_queue)
-	output_queue << "Test msg 1" 
-	output_queue << "Test msg 2" 
-	output_queue << "Test msg 3" 
+	  output_queue << "Test msg 1" 
+	  output_queue << "Test msg 2" 
+	  output_queue << "Test msg 3" 
   end
+
+	def proc_is_running?
+    true
+	end
   
   def wait_for_process_to_start
     sleep 1

metadata

@@ -1,47 +1,47 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-perfmon
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 1.0.0
 platform: ruby
 authors:
 - Nick Ramirez
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-19 00:00:00.000000000 Z
+date: 2017-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 5.0.0
   name: logstash-core
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   name: logstash-codec-plain
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   name: logstash-devutils
@@ -49,15 +49,20 @@ 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. 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:
+- ".github/CONTRIBUTING.md"
+- ".github/ISSUE_TEMPLATE.md"
+- ".github/PULL_REQUEST_TEMPLATE.md"
 - ".gitignore"
 - ".travis.yml"
 - CHANGELOG.md
@@ -97,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key:
 specification_version: 4
 summary: Logstash input for Windows Performance Monitor