sensu-plugins-beanstalk 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e01a54a1e7214db903ce022b8fecc79a0f890e9
-  data.tar.gz: e8c17e3d7bc5d6d960e54f8dd1663363c6fd79c9
+  metadata.gz: 54f73f6a0282dfe33562f5eceedeafa7e8431a62
+  data.tar.gz: 7c4aaf8616caad47fb7b314e5b0a014a4afc576f
 SHA512:
-  metadata.gz: 2a6b8670534588ed98e1b3760c7c3d2b940c6c50d7489b0acbc9be8c68aa9df567af09e872c449e6bda2cd29105c4f61efa1a4b8570b80c9a31a563358850a01
-  data.tar.gz: 5191aa870c690135060604201efb19c167f9d7f11b7923845d4093c3f5b01cf179b5432e9809a07ec9662bf0702ac4ab79087eeea4eb773184ea23768fb0bd78
+  metadata.gz: ad7244f2cd7b08d82e41f0d0ab0e82590591697487df932479c667fff42f382708fde3b8faae3a2fbb0e33e48b45878b35ff0b5db532bd7ab22734d8615743d4
+  data.tar.gz: 4c9f287845e72f29adc1a2e1288af793aec2eb583a1e4cba2fb2259a5dbcf4d00b6c3bdd0f3758376a0925c76ab11df6cf47fb3b459385579eb0f0a6c20fc2c1

data/CHANGELOG.md

@@ -5,6 +5,11 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## [Unreleased]
 
+## [1.2.0] - 2017-10-22
+### Added
+- real tests with serverspec (@anakinj)
+- check-beanstalkd, ignore missing queues by default. Behavior controlled by --alert-on-missing parameter. (@anakinj)
+
 ## [1.1.0] - 2017-08-15
 ### Added
 - Option to get the age of a item in the tubes. add age to the --stats (@derkgort)
@@ -38,6 +43,7 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 - initial release
 
 [Unreleased]: https://github.com/sensu-plugins/sensu-plugins-beanstalk/compare/1.1.0...HEAD
+[1.2.0]: https://github.com/sensu-plugins/sensu-plugins-beanstalk/compare/1.1.0...1.2.0
 [1.1.0]: https://github.com/sensu-plugins/sensu-plugins-beanstalk/compare/1.0.0...1.1.0
 [1.0.0]: https://github.com/sensu-plugins/sensu-plugins-beanstalk/compare/0.0.4...1.0.0
 [0.0.4]: https://github.com/sensu-plugins/sensu-plugins-beanstalk/compare/0.0.3...0.0.4

data/bin/check-beanstalkd.rb

@@ -54,6 +54,14 @@ class BeanstalkdQueuesStatus < Sensu::Plugin::Check::CLI
          long:        '--port PORT',
          default:     '11300'
 
+  option :alert_on_missing,
+         description: 'alert type when tube is missing',
+         short:       '-a TYPE',
+         long:        '--alert-on-missing TYPE',
+         proc:        proc { |value| value.to_sym },
+         in:          [:critical, :warning, :ignore],
+         default:     :ignore
+
   option :ready,
          description: 'ready tasks WARNING/CRITICAL thresholds',
          short:       '-r W,C',
@@ -85,44 +93,65 @@ class BeanstalkdQueuesStatus < Sensu::Plugin::Check::CLI
   end
 
   def run
-    stats = acquire_beanstalkd_connection.tubes[config[:tube].to_s].stats
+    warns, crits, msg = check_queues(tube_stats)
     message 'All queues are healthy'
 
-    warns, crits, msg = check_queues(stats)
-    msg.join("\n")
-
-    if crits.size > 0 # rubocop:disable Style/ZeroLengthPredicate
+    unless crits.empty?
       message msg
       critical
     end
 
-    if warns.size > 0 # rubocop:disable Style/ZeroLengthPredicate
+    unless warns.empty?
       message msg
       warning
     end
+
     ok
   end
 
+  JOB_STATES = [:ready, :urgent, :buried].freeze
+
   def check_queues(stats)
     msg = []
     crits = {}
     warns = {}
 
-    [:ready, :urgent, :buried].each do |task|
-      tasks = stats.send("current_jobs_#{task}".to_sym)
+    JOB_STATES.each do |job_state|
+      jobs = stats.send("current_jobs_#{job_state}".to_sym)
 
-      if tasks > config[task][1]
-        crits[task] = tasks
-        msg << task.to_s + " queue has #{tasks} items"
+      if jobs > config[job_state][1]
+        crits[job_state] = jobs
+        msg << job_state.to_s + " queue has #{jobs} items"
         next
       end
 
-      if tasks > config[task][0]
-        warns[task] = tasks
-        msg << task.to_s + " queue has #{tasks} items"
+      if jobs > config[job_state][0]
+        warns[job_state] = jobs
+        msg << job_state.to_s + " queue has #{jobs} items"
       end
     end
 
     [warns, crits, msg]
   end
+
+  def tube_stats
+    acquire_beanstalkd_connection.tubes[config[:tube].to_s].stats
+  rescue Beaneater::NotFoundError
+    case config[:alert_on_missing]
+    when :warning, :critical
+      send(config[:alert_on_missing], "Tube #{config[:tube]} is missing")
+    else
+      empty_queue_stats
+    end
+  end
+
+  def empty_queue_stats
+    stats = OpenStruct.new
+
+    JOB_STATES.each do |job_state|
+      stats.send("current_jobs_#{job_state}=", 0)
+    end
+
+    stats
+  end
 end

data/lib/sensu-plugins-beanstalk/version.rb

@@ -1,7 +1,7 @@
 module SensuPluginsBeanstalk
   module Version
     MAJOR = 1
-    MINOR = 1
+    MINOR = 2
     PATCH = 0
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-beanstalk
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-16 00:00:00.000000000 Z
+date: 2017-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -178,16 +178,72 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: serverspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.36.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.36.1
+- !ruby/object:Gem::Dependency
+  name: test-kitchen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: kitchen-docker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
+- !ruby/object:Gem::Dependency
+  name: kitchen-localhost
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 description: Sensu plugins for beanstalk
 email: "<sensu-users@googlegroups.com>"
 executables:
-- check-beanstalk-jobs.rb
-- check-beanstalk-statistic.rb
 - check-beanstalk-watchers-to-buried.rb
+- check-beanstalk-jobs.rb
 - check-beanstalk-watchers.rb
+- check-beanstalk-statistic.rb
 - check-beanstalkd.rb
-- metrics-beanstalkd-tubes.rb
 - metrics-beanstalkd.rb
+- metrics-beanstalkd-tubes.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -229,7 +285,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for beanstalk