nagios_check_resque 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea510ab463796225c4c28151edfcf363ffa1cf3b
-  data.tar.gz: fcabefd39deea0fc6ab465b257497fc86f45b2f9
+  metadata.gz: 5c7350790cc753e49727fed05140218542a07708
+  data.tar.gz: 69ef4dae4f26fd19e33f5154a26b57683faf944f
 SHA512:
-  metadata.gz: 929d21db1b9987ee1b34df5f9d08bb64be6881ca47adc5cb467caf80bbe745372b03ab7b12236cdf52acb08bfd8adffa8c6ea13b0b1d02ba705cd43172f6990e
-  data.tar.gz: d5423867a518a023e70835bc4999737bf1d5c2e941d75458b1aaec371f9101b6a850846f8cca0bade454d09de15262afa03aed0a7704ad903b42c5c2cc0c80e0
+  metadata.gz: 68bf5833da6dd7b1c98ebab42b87b0d87a1c97145bd2470896753d752e28895e013902f59ca18cce47d191069859c403dfb83d4b179bd1997bdee952bc12bbce
+  data.tar.gz: b90a817a4b9a544f32bceb6e1d7eff74c54bdf9ff59c1466dddf226212b1f127e2c3ce046f1412bc9aab8c6a3ef99d5f3113a3c09685404398a2a29bfadd3dd2

data/.gitignore

@@ -6,4 +6,5 @@
 /doc/
 /pkg/
 /spec/reports/
+/spec/examples.txt
 /tmp/

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/.travis.yml

@@ -0,0 +1,10 @@
+language: ruby
+sudo: false
+rvm:
+  - 2.0.0
+  - 2.1
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
+  - ruby-head
+before_install: gem install bundler

data/CHANGELOG.md

@@ -2,10 +2,20 @@
 
 ### Changes on `master`
 
-[Compare changes](https://github.com/codevise/nagios_check_resque/compare/v1.0.0...master)
+[Compare changes](https://github.com/codevise/nagios_check_resque/compare/v1.1.0...master)
 
 None so far.
 
+### Version 1.1.0
+
+2017-05-26
+
+[Compare changes](https://github.com/codevise/nagios_check_resque/compare/v1.0.0...v1.1.0)
+
+- Allow passing custom Redis URL as environment variable or command
+  line option.
+- Make checks store human readable message.
+
 ### Version 1.0.0
 
 2017-02-21

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in nagios_check_resque.gemspec
 gemspec
+
+gem 'nagios_check', git: 'https://github.com/tf/nagios_check', branch: 'check-result'

data/README.md

@@ -1,15 +1,16 @@
 # Nagios Check Resque
 
 [![Gem Version](https://badge.fury.io/rb/nagios_check_resque.svg)](http://badge.fury.io/rb/nagios_check_resque)
+[![Build Status](https://travis-ci.org/codevise/nagios_check_resque.svg?branch=master)](https://travis-ci.org/codevise/nagios_check_resque)
 
-Nagios plugins to check Resque queue sized and number of failed jobs.
+Nagios plugins to check Resque queue sizes and number of failed jobs.
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'nagios_check_resque', require: false
+gem 'nagios_check_resque', '~> 1.0', require: false
 ```
 
 And then execute:
@@ -40,6 +41,16 @@ more than 5 failed jobs but not more than 8, the result is WARNING.
 If there are more than 8 failed jobs, the result is CRITICAL.  If the
 command takes more than 10 seconds to finish, the result is UNKNOWN.
 
+## Specifying a Redis URL
+
+By default the checks assume that Redis is accessible at
+`localhost:6379`. A different Redis URL can either be passed via the
+command line:
+
+    $ bundle exec nagios_check_resque_failed_jobs -w 5 -c 8 -t 10 --redis-url redis://other:6379
+
+or by setting the environment variable `REDIS_URL`.
+
 ## Example Nagios Configuration
 
 You can define a custom Nagios command to invoke the executables via
@@ -86,8 +97,9 @@ define service {
 ## Development
 
 After checking out the repo, run `bin/setup` to install
-dependencies. You can also run `bin/console` for an interactive prompt
-that will allow you to experiment.
+dependencies. Run `bin/rspec` to execute the test suite. You can also
+run `bin/console` for an interactive prompt that will allow you to
+experiment.
 
 To install this gem onto your local machine, run `bundle exec rake
 install`. To release a new version, update the version number in

data/Rakefile

@@ -1,2 +1,6 @@
 require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
 task :default => :spec

data/bin/rake

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rake", "rake")

data/bin/rspec

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rspec-core", "rspec")

data/lib/nagios_check_resque.rb

@@ -1,5 +1,4 @@
 require 'nagios_check_resque/version'
 
 module NagiosCheckResque
-  # Your code goes here...
 end

data/lib/nagios_check_resque/failed_jobs_check.rb

@@ -1,29 +1,28 @@
 require 'nagios_check'
-
-require 'resque'
-require 'resque/failure/redis'
+require 'nagios_check_resque/resque_adapter'
 
 module NagiosCheckResque
   # Warn if there are failed jobs
   class FailedJobsCheck
     include NagiosCheck
 
-    on '--redis-host HOST', default: 'redis://localhost:6379'
+    on '--redis-url URL', default: ENV.fetch('REDIS_URL', 'redis://localhost:6379')
 
     enable_warning
     enable_critical
     enable_timeout
 
-    def check
-      setup_resque
-      store_value(:failed, Resque::Failure::Redis.count)
+    def initialize(resque = ResqueAdapter.new)
+      @resque = resque
     end
 
-    private
+    def check
+      @resque.setup(redis_url: options['redis-url'])
+
+      failed_jobs_count = @resque.failed_count
 
-    def setup_resque
-      Resque.redis = Redis.new(host: options.redis_host)
-      Resque
+      store_message("#{failed_jobs_count} failed jobs")
+      store_value(:failed, failed_jobs_count)
     end
   end
 end

data/lib/nagios_check_resque/queue_size_check.rb

@@ -1,5 +1,5 @@
 require 'nagios_check'
-require 'resque'
+require 'nagios_check_resque/resque_adapter'
 
 module NagiosCheckResque
   # Prevent jobs from queuing up
@@ -7,15 +7,20 @@ module NagiosCheckResque
     include NagiosCheck
 
     on '--queues QUEUES', :mandatory
-    on '--redis-host HOST', default: 'redis://localhost:6379'
+    on '--redis-url URL', default: ENV.fetch('REDIS_URL', 'redis://localhost:6379')
 
     enable_warning
     enable_critical
     enable_timeout
 
+    def initialize(resque = ResqueAdapter.new)
+      @resque = resque
+    end
+
     def check
-      setup_resque
+      @resque.setup(redis_url: options['redis-url'])
 
+      store_message(queue_sizes_message)
       store_value(:max, queue_sizes.values.max)
 
       queue_sizes.each do |name, size|
@@ -25,18 +30,20 @@ module NagiosCheckResque
 
     private
 
+    def queue_sizes_message
+      queue_sizes.sort_by { |_, size| size }.reverse.map { |name, size|
+        "#{size} in #{name}"
+      }.compact.join(', ')
+    end
+
     def queue_sizes
       @queue_sizes ||= queues.each_with_object({}) do |name, sizes|
-        sizes[name] = Resque.size(name)
+        sizes[name] = @resque.queue_size(name)
       end
     end
 
     def queues
       options.queues.split(',')
     end
-
-    def setup_resque
-      Resque.redis = Redis.new(host: options.redis_host)
-    end
   end
 end

data/lib/nagios_check_resque/resque_adapter.rb

@@ -0,0 +1,18 @@
+require 'resque'
+require 'resque/failure/redis'
+
+module NagiosCheckResque
+  class ResqueAdapter
+    def setup(options)
+      Resque.redis = options[:redis_url]
+    end
+
+    def queue_size(queue)
+      Resque.size(queue)
+    end
+
+    def failed_count
+      Resque::Failure::Redis.count
+    end
+  end
+end

data/lib/nagios_check_resque/version.rb

@@ -1,3 +1,3 @@
 module NagiosCheckResque
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.1.0'.freeze
 end

data/nagios_check_resque.gemspec

@@ -20,9 +20,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version = '>= 2.0'
+
   spec.add_dependency 'nagios_check', '~> 0.4.0'
   spec.add_dependency 'resque', '~> 1.25'
 
   spec.add_development_dependency 'bundler', '~> 1.14'
   spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nagios_check_resque
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Codevise Solutions Ltd
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-21 00:00:00.000000000 Z
+date: 2017-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nagios_check
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
 description: 
 email:
 - info@codevise.de
@@ -76,6 +90,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -83,12 +99,15 @@ files:
 - README.md
 - Rakefile
 - bin/console
+- bin/rake
+- bin/rspec
 - bin/setup
 - exe/nagios_check_resque_failed_jobs
 - exe/nagios_check_resque_queue_sizes
 - lib/nagios_check_resque.rb
 - lib/nagios_check_resque/failed_jobs_check.rb
 - lib/nagios_check_resque/queue_size_check.rb
+- lib/nagios_check_resque/resque_adapter.rb
 - lib/nagios_check_resque/version.rb
 - nagios_check_resque.gemspec
 homepage: http://github.com/codevise/nagios_check_resque
@@ -103,7 +122,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="