logstash-output-nagios 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2333bed4da14aecb3fff7a6771f459b2a3bc8dce
-  data.tar.gz: 001bff207a0cb50aaddc31bd27d60817ae9a1da7
+  metadata.gz: d4490e2d4923050abf96853ccb696d81a5c2250a
+  data.tar.gz: 6b8d9bb9f32987cc10b2e29dd51ad38c0eb848b0
 SHA512:
-  metadata.gz: e32fb1a88ccab36bc42f709a1bdffee04215812912b66bd454e998cd502b365759fc59b86dbe6f33ca8dd76b17d545bdb9217893c690ea51af86b88f093abe71
-  data.tar.gz: 1b09256934185b4b5a074fa8b2e9370134a5168be7fd80d0e46bd90a448642c9e22c5f4fb70f5314438d6566ca2562c40b682247bcc617c632da1ff0292b6e40
+  metadata.gz: 87249592f9987856ead51d22337ecf4e750efcbb8889d462b149ef507111744d89145460a3ab823caccfb03ff2263fd2c44e4ea05f34f94c339c3564b02a10fe
+  data.tar.gz: 104f46387eb144c9683f4fc351f1067e0b8d106daaef739cb7d181c28094438f6988429da131407f9541fe414a3048a51700d5c949425788dc10ccfb48392172

data/CHANGELOG.md

@@ -0,0 +1,4 @@
+# 1.1.0
+  - Small refactoring to have functions out of small concepts.
+  - Remove the path validation as is broken from the LS side
+  - Added basic test to the project

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.rb

@@ -36,22 +36,20 @@ class LogStash::Outputs::Nagios < LogStash::Outputs::Base
   config_name "nagios"
 
   # The full path to your Nagios command file.
-  config :commandfile, :validate => :path, :default => "/var/lib/nagios3/rw/nagios.cmd"
+  config :commandfile, :default => "/var/lib/nagios3/rw/nagios.cmd"
 
   # The Nagios check level. Should be one of 0=OK, 1=WARNING, 2=CRITICAL,
   # 3=UNKNOWN. Defaults to 2 - CRITICAL.
   config :nagios_level, :validate => [ "0", "1", "2", "3" ], :default => "2"
 
-  public
   def register
     # nothing to do
   end # def register
 
-  public
   def receive(event)
     return unless output?(event)
 
-    if !File.exists?(@commandfile)
+    if !command_file_exist?
       @logger.warn("Skipping nagios output; command file is missing",
                    :commandfile => @commandfile, :missed_event => event)
       return
@@ -105,14 +103,24 @@ class LogStash::Outputs::Nagios < LogStash::Outputs::Base
     @logger.debug("Opening nagios command file", :commandfile => @commandfile,
                   :nagios_command => cmd)
     begin
-      File.open(@commandfile, "r+") do |f|
-        f.puts(cmd)
-        f.flush # TODO(sissel): probably don't need this.
-      end
+      send_to_nagios(cmd)
     rescue => e
       @logger.warn("Skipping nagios output; error writing to command file",
                    :commandfile => @commandfile, :missed_event => event,
                    :exception => e, :backtrace => e.backtrace)
     end
   end # def receive
+
+  private
+
+  def command_file_exist?
+    File.exists?(@commandfile)
+  end
+
+  def send_to_nagios(cmd)
+    File.open(@commandfile, "r+") do |f|
+      f.puts(cmd)
+      f.flush # TODO(sissel): probably don't need this.
+    end
+  end
 end # class LogStash::Outputs::Nagios

data/logstash-output-nagios.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-nagios'
-  s.version         = '1.0.0'
+  s.version         = '1.1.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "The Nagios output is used for sending passive check results to Nagios via the Nagios command file"
   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_spec.rb

@@ -1 +1,27 @@
-require "logstash/devutils/rspec/spec_helper"
+# encoding: utf-8
+require_relative "../spec_helper"
+
+describe LogStash::Outputs::Nagios do
+
+  it "should register without errors" do
+    plugin = LogStash::Plugin.lookup("output", "nagios").new
+    expect { plugin.register }.to_not raise_error
+  end
+
+  describe "send" do
+
+    let(:properties) { { "message" => "This is a message!", "nagios_service" => "nagios_service", "nagios_host" => "nagios_host" } }
+    let(:event)      { LogStash::Event.new(properties) }
+
+    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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-nagios
 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.rb
+- spec/spec_helper.rb
+- spec/outputs/nagios_spec.rb
+- logstash-output-nagios.gemspec
+- README.md
 - CHANGELOG.md
 - CONTRIBUTORS
 - Gemfile
 - LICENSE
 - NOTICE.TXT
-- README.md
-- Rakefile
-- lib/logstash/outputs/nagios.rb
-- logstash-output-nagios.gemspec
-- spec/outputs/nagios_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: The Nagios output is used for sending passive check results to Nagios via the Nagios command file
 test_files:
+- spec/spec_helper.rb
 - spec/outputs/nagios_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"