logstash-output-nagios_nsca 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86c860a7d564bb51d5c2645f9d9fc645aafc5867
-  data.tar.gz: cffdb57ef48874b66a259afd64f4fd15988a3388
+  metadata.gz: e33d03b1698c4939671b35cc1978d3918d3fedd7
+  data.tar.gz: a2a7677936f9571d4832c4c1a9b88af273833c55
 SHA512:
-  metadata.gz: 4d2f01ca71d2abdf10e82a9efa604790a4b98418974318d35debb6e206bff203ce468558ad6e1a3ee63653f4b705d3832b4facaf41c10f0d895b9a25cc8fe91c
-  data.tar.gz: cdf275b69574661560a6e7d233ec14cd61b855b4d99b9157b99d0c6c372f40dfe9dc0bf170318a9a313d370020f19ff10c14dd659364e36ac9c92cad8e644c52
+  metadata.gz: 403099038c1ba193b0165258bb795a7bd2fc7e8b63a964bf4fd974f6b77a0bf702c1c85ccc0d55a8a791d1d6a0090602db87e611ce90aaed3683cac0e986573b
+  data.tar.gz: 7d47667b95fab12bd935c1a32e629adfcadde83c6ffb823b0d62c3cd3b582647be55949fd426e9d36730706d8e0ec67ca1f464109586f9f7512ceb280dcdcf82

data/CHANGELOG.md

@@ -0,0 +1,2 @@
+# 1.1.0
+  - Add basic test for the plugin

data/README.md

@@ -1,15 +1,15 @@
 # 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.
 
 ## Documentation
 
-Logstash provides infrastructure to automatically generate documentation for this plugin. We use the asciidoc format to write documentation so any comments in the source code will be first converted into asciidoc and then into html. All plugin documentation are placed under one [central location](http://www.elasticsearch.org/guide/en/logstash/current/).
+Logstash provides infrastructure to automatically generate documentation for this plugin. We use the asciidoc format to write documentation so any comments in the source code will be first converted into asciidoc and then into html. All plugin documentation are placed under one [central location](http://www.elastic.co/guide/en/logstash/current/).
 
 - For formatting code or config example, you can use the asciidoc `[source,ruby]` directive
-- For more asciidoc formatting tips, see the excellent reference here https://github.com/elasticsearch/docs#asciidoc-guide
+- For more asciidoc formatting tips, see the excellent reference here https://github.com/elastic/docs#asciidoc-guide
 
 ## Need Help?
 
@@ -83,4 +83,4 @@ Programming is not a required skill. Whatever you've seen about open source and
 
 It is more important to the community that you are able to contribute.
 
-For more information about contributing, see the [CONTRIBUTING](https://github.com/elasticsearch/logstash/blob/master/CONTRIBUTING.md) file.
+For more information about contributing, see the [CONTRIBUTING](https://github.com/elastic/logstash/blob/master/CONTRIBUTING.md) file.

data/lib/logstash/outputs/nagios_nsca.rb

@@ -37,7 +37,7 @@ class LogStash::Outputs::NagiosNsca < LogStash::Outputs::Base
   config :port, :validate => :number, :default => 5667
 
   # The path to the 'send_nsca' binary on the local host.
-  config :send_nsca_bin, :validate => :path, :default => "/usr/sbin/send_nsca"
+  config :send_nsca_bin, :validate => :string, :default => "/usr/sbin/send_nsca"
 
   # The path to the send_nsca config file on the local host.
   # Leave blank if you don't want to provide a config file.
@@ -75,7 +75,7 @@ class LogStash::Outputs::NagiosNsca < LogStash::Outputs::Base
     end
 
     # skip if 'send_nsca' binary doesn't exist
-    if !File.exists?(@send_nsca_bin)
+    if !command_file_exist?
       @logger.warn("Skipping nagios_nsca output; send_nsca_bin file is missing",
                    "send_nsca_bin" => @send_nsca_bin, "missed_event" => event)
       return
@@ -114,10 +114,7 @@ class LogStash::Outputs::NagiosNsca < LogStash::Outputs::Base
     @logger.debug("Running send_nsca command", :nagios_nsca_command => cmd.join(" "), :message => message)
 
     begin
-      Open3.popen3(*cmd) do |i, o, e|
-        i.puts(message)
-        i.close
-      end
+      send_to_nagios(cmd)
     rescue => e
       @logger.warn(
         "Skipping nagios_nsca output; error calling send_nsca",
@@ -129,4 +126,16 @@ class LogStash::Outputs::NagiosNsca < LogStash::Outputs::Base
       @logger.debug("Backtrace", :backtrace => e.backtrace)
     end
   end # def receive
+
+  def command_file_exist?
+    File.exists?(@send_nsca_bin)
+  end
+
+  def send_to_nagios(cmd)
+    Open3.popen3(*cmd) do |i, o, e|
+      i.puts(message)
+      i.close
+    end
+  end
+
 end # class LogStash::Outputs::NagiosNsca

data/logstash-output-nagios_nsca.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-nagios_nsca'
-  s.version         = '1.0.0'
+  s.version         = '1.1.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "This output is used for sending passive check results to Nagios through the NSCA protocol."
   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"
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # Files
-  s.files = `git ls-files`.split($\)+::Dir.glob('vendor/*')
+  s.files = Dir['lib/**/*','spec/**/*','vendor/**/*','*.gemspec','*.md','CONTRIBUTORS','Gemfile','LICENSE','NOTICE.TXT']
 
   # Tests
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
@@ -21,6 +21,7 @@ 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_development_dependency 'logstash-devutils'
 end

data/spec/outputs/nagios_nsca_spec.rb

@@ -1 +1,30 @@
-require "logstash/devutils/rspec/spec_helper"
+# encoding: utf-8
+require_relative "../spec_helper"
+
+describe LogStash::Outputs::NagiosNsca do
+
+  it "should register without errors" do
+    plugin = LogStash::Plugin.lookup("output", "nagios_nsca").new({"nagios_status" => "1"})
+    expect { plugin.register }.to_not raise_error
+  end
+
+  describe "send" do
+
+    let(:properties) { { "message" => "This is a message!", "nagios_status" => "nagios_status" } }
+    let(:event)      { LogStash::Event.new(properties) }
+
+
+    subject { LogStash::Outputs::NagiosNsca.new({ "nagios_status" => "1" }) }
+
+    before(:each) do
+      subject.register
+      expect(subject).to receive(:command_file_exist?).and_return(true)
+    end
+
+    it "send the event to nagios" do
+      expect(subject).to receive(:send_to_nagios)
+      subject.receive(event)
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1,3 @@
+# encoding: utf-8
+require "logstash/devutils/rspec/spec_helper"
+require "logstash/outputs/nagios_nsca"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-nagios_nsca
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2015-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core
@@ -30,6 +30,20 @@ dependencies:
         version: 2.0.0
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: logstash-codec-plain
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: logstash-devutils
   version_requirements: !ruby/object:Gem::Requirement
@@ -50,17 +64,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- lib/logstash/outputs/nagios_nsca.rb
+- spec/spec_helper.rb
+- spec/outputs/nagios_nsca_spec.rb
+- logstash-output-nagios_nsca.gemspec
+- README.md
 - CHANGELOG.md
 - CONTRIBUTORS
 - Gemfile
 - LICENSE
 - NOTICE.TXT
-- README.md
-- Rakefile
-- lib/logstash/outputs/nagios_nsca.rb
-- logstash-output-nagios_nsca.gemspec
-- spec/outputs/nagios_nsca_spec.rb
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)
@@ -83,9 +96,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.2.2
+rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
 summary: This output is used for sending passive check results to Nagios through the NSCA protocol.
 test_files:
+- spec/spec_helper.rb
 - spec/outputs/nagios_nsca_spec.rb

data/.gitignore

@@ -1,4 +0,0 @@
-*.gem
-Gemfile.lock
-.bundle
-vendor

data/Rakefile

@@ -1,7 +0,0 @@
-@files=[]
-
-task :default do
-  system("rake -T")
-end
-
-require "logstash/devutils/rake"