logstash-output-nagios_nsca 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78692900389040106f71aec8e7f20a63e4a5a146
-  data.tar.gz: 71514881cfef02d4accaa902fc200d141028e126
+  metadata.gz: a18665fc36fb79c963745ef609ad4ac9aa4881f0
+  data.tar.gz: 0743254bc9ebbda143ee02a67bf1ca94cb1693ef
 SHA512:
-  metadata.gz: a3993b08c48f5066f0373e616e4412da23c8fc0970395590fba7c49b09df67a81618248a0effdc5f0365081e68d4a0e2d9f76bfe81ade15316c4ccb1665d6fd5
-  data.tar.gz: fa0430ec5465c701ea047a872d5a25c26dba4b60bbb6714401021adc813ddc5de5b69dddb407c6643ba3f4c9d28816f9552a4660466b50ca68f4a8b2ac47899c
+  metadata.gz: d312e59c957e02fa5906864ab3867cee8d3d8e0f8b5776a73d2486a97449cf9f642273f3aaf30cb0b8dbab1d138e951b22ea3d2a8487917d0c4f952129dc8a13
+  data.tar.gz: 9cb350477c3fef7d2cb357c9f51587af78873e7d076035a7d805414e41fcb3ddc566fa421850c7227deab609fa68e314d1d59886a8c344bc12ce4e8a6ab66155

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2.0.3
+ - Fix plugin command to nagios and command format, fixes #3
+ - Fix the nagios command format, fixes #3
 ## 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

data/README.md

@@ -1,5 +1,8 @@
 # Logstash Plugin
 
+[![Build
+Status](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Outputs/job/logstash-plugin-output-nagios_nsca-unit/badge/icon)](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Outputs/job/logstash-plugin-output-nagios_nsca-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.

data/lib/logstash/outputs/nagios_nsca.rb

@@ -66,8 +66,6 @@ class LogStash::Outputs::NagiosNsca < LogStash::Outputs::Base
   public
   def receive(event)
     # exit if type or tags don't match
-    
-
     # catch logstash shutdown
     return if event == LogStash::SHUTDOWN
 
@@ -104,14 +102,12 @@ class LogStash::Outputs::NagiosNsca < LogStash::Outputs::Base
     # syntax: echo '<server>!<nagios_service>!<status>!<text>'  | \
     #           /usr/sbin/send_nsca -H <nagios_host> -d '!' -c <nsca_config>"
 
-    cmd = [@send_nsca_bin, "-H", @host, "-p", @port, "-d", "~"]
-    cmd = cmd + ["-c", @send_nsca_config]  if @send_nsca_config
-    message = "#{nagios_host}~#{nagios_service}~#{status}~#{msg}"
+    message = "#{nagios_host}:#{nagios_service}:#{status}:#{msg}"
 
     @logger.debug("Running send_nsca command", :nagios_nsca_command => cmd.join(" "), :message => message)
 
     begin
-      send_to_nagios(cmd)
+      send_to_nagios(cmd, message)
     rescue => e
       @logger.warn(
         "Skipping nagios_nsca output; error calling send_nsca",
@@ -128,9 +124,16 @@ class LogStash::Outputs::NagiosNsca < LogStash::Outputs::Base
     File.exists?(@send_nsca_bin)
   end
 
-  def send_to_nagios(cmd)
+  def cmd
+    return @cmd if @cmd
+    @cmd = [@send_nsca_bin, "-H", @host, "-p", @port, "-d", ":"]
+    @cmd = @cmd + ["-c", @send_nsca_config]  if @send_nsca_config
+    @cmd
+  end
+
+  def send_to_nagios(cmd, message)
     Open3.popen3(*cmd) do |i, o, e|
-      i.puts(message)
+      i.puts(message) 	
       i.close
     end
   end

data/logstash-output-nagios_nsca.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-nagios_nsca'
-  s.version         = '2.0.2'
+  s.version         = '2.0.3'
   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"

data/spec/outputs/nagios_nsca_spec.rb

@@ -22,7 +22,7 @@ describe LogStash::Outputs::NagiosNsca do
     end
 
     it "send the event to nagios" do
-      expect(subject).to receive(:send_to_nagios)
+      expect(subject).to receive(:send_to_nagios).with(subject.cmd, instance_of(String))
       subject.receive(event)
     end
   end

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-nagios_nsca
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2015-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  name: logstash-core
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -19,10 +20,7 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 3.0.0
-  name: logstash-core
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -30,34 +28,36 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 3.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'
-  name: logstash-codec-plain
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: logstash-devutils
   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
   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
 email: info@elastic.co
 executables: []