sensu-plugins-rabbitmq 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 116dbb6b62aa64caac312e1343b5a936359bdee6
-  data.tar.gz: 498801298df6a8841e34dc46e09c95d0f01d387a
+  metadata.gz: ff32df838a2e797f64a61cbe8252c90dbc4c9a0b
+  data.tar.gz: 22809d71989e50eec3dd8adbe9250d1bab5d0599
 SHA512:
-  metadata.gz: d03370a0f1f389a551464da5e18c4d5bbb7581a6ef5710787e930dda4a045e0870daf24de019487fa4bc503c0b7a99c06f98eda12741eb1acd54002410bb805a
-  data.tar.gz: abe18f42bd43c449f4cd330ae47ae4496eb9e64d7e34e476c76180c0163ca7706a6019e471a70db8c42a073dd67a2d221d0c6f25fc1bfc3dc694c21fcf9a8b24
+  metadata.gz: 6fe85be96dc866d9c236252b3495272173b45818830fc7fd6086e9e7a5ddef51571dcfedd71fe2e92ee439d91a145eed6dedfb73ac281fecd95f59243ed1b3bc
+  data.tar.gz: 2ccf9af3dd6ef5095ad8221d15639085c8e7cd59e3c8e6059f8c465dcfffc3f068c31cdd4cde9f711f7b8d10ee22a00294edb9c8e055ba9bb84aace88608197d

data/CHANGELOG.md

@@ -4,6 +4,17 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
+### [2.2.0] - 2017-05-08
+### Added
+ - check-rabbitmq-queue.rb: Added --below feature to specify if value below threshold should generate alert (@alexpekurovsky)
+
+### Fixed
+ - check-rabbitmq-queue.rb: Fixes for assigning values to critical or warning states (@alexpekurovsky)
+ - check-rabbitmq-consumers.rb: Fixes rabbitmq empty value for consumers in some situations (@mdzidic)
+ - check-rabbitmq-consumers.rb: Fixes rabbitmq plugin crash when node is in network partition (@mdzidic)
+
+### Changed
+- bump stomp version to 1.4.3
 
 ## [2.1.0] - 2017-01-10
 ### Added
@@ -107,7 +118,8 @@ NOTE: this release changes the option flags in check-rabbitmq-node-health.rb to
 - Remove copy paste errors in the Readme
 - Removed Rubygems require Ruby 1.8.7 backwards compatibility from all plugins
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-rabbitmq/compare/2.1.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-rabbitmq/compare/2.2.0...HEAD
+[2.2.0]: https://github.com/sensu-plugins/sensu-plugins-rabbitmq/compare/2.1.0...2.2.0
 [2.1.0]: https://github.com/sensu-plugins/sensu-plugins-rabbitmq/compare/2.0.0...2.1.0
 [2.0.0]: https://github.com/sensu-plugins/sensu-plugins-rabbitmq/compare/1.3.0...2.0.0
 [1.3.0]: https://github.com/sensu-plugins/sensu-plugins-rabbitmq/compare/1.2.0...1.3.0

data/bin/check-rabbitmq-consumers.rb

@@ -112,20 +112,23 @@ class CheckRabbitMQConsumers < Sensu::Plugin::Check::CLI
     critical = []
     warn = []
 
-    rabbit.queues.each do |queue|
-      # if specific queues were passed only monitor those.
-      # if specific queues to exclude were passed then skip those
-      if config[:queue]
-        next unless config[:queue].include?(queue['name'])
-      elsif config[:exclude]
-        next if config[:exclude].include?(queue['name'])
+    begin
+      rabbit.queues.each do |queue|
+        # if specific queues were passed only monitor those.
+        # if specific queues to exclude were passed then skip those
+        if config[:queue]
+          next unless config[:queue].include?(queue['name'])
+        elsif config[:exclude]
+          next if config[:exclude].include?(queue['name'])
+        end
+        missing.delete(queue['name'])
+        consumers = queue['consumers'] || 0
+        critical.push(queue['name']) if consumers <= config[:critical]
+        warn.push(queue['name']) if consumers <= config[:warn]
       end
-      missing.delete(queue['name'])
-      consumers = queue['consumers']
-      critical.push(queue['name']) if consumers <= config[:critical]
-      warn.push(queue['name']) if consumers <= config[:warn]
+    rescue
+      critical 'Could not find any queue, check rabbitmq server'
     end
-
     return_condition(missing, critical, warn)
   end
 end

data/bin/check-rabbitmq-queue.rb

@@ -96,6 +96,12 @@ class CheckRabbitMQMessages < Sensu::Plugin::Check::CLI
          boolean: true,
          default: false
 
+  option :below,
+         description: 'If set, values under threshold are counted as warning/critical',
+         long: '--below',
+         boolean: true,
+         default: false
+
   def acquire_rabbitmq_info
     begin
       rabbitmq_info = CarrotTop.new(
@@ -115,7 +121,7 @@ class CheckRabbitMQMessages < Sensu::Plugin::Check::CLI
     @crit = []
     @warn = []
     rabbitmq = acquire_rabbitmq_info
-    queues = rabbitmq.method_missing('/queues/' + config[:vhost])
+    queues = rabbitmq.method_missing('queues/' + config[:vhost])
     config[:queue].each do |q|
       unless (queues.map { |hash| hash['name'] }.include?(q) && config[:regex] == false) || config[:regex] == true
         unless config[:ignore]
@@ -128,10 +134,23 @@ class CheckRabbitMQMessages < Sensu::Plugin::Check::CLI
         total = queue['messages']
         total = 0 if total.nil?
         message total.to_s
-        @crit << "#{queue['name']}:#{total}" if total > config[:critical].to_i
-        @warn << "#{queue['name']}:#{total}" if total > config[:warn].to_i && total < config[:critical].to_i
+        assign_alerts(queue['name'], total)
       end
     end
+    generate_output
+  end
+
+  def assign_alerts(queue_name, total)
+    if config[:below]
+      @crit << "#{queue_name}:#{total}" if total <= config[:critical].to_i
+      @warn << "#{queue_name}:#{total}" if total <= config[:warn].to_i && total > config[:critical].to_i
+    else
+      @crit << "#{queue_name}:#{total}" if total >= config[:critical].to_i
+      @warn << "#{queue_name}:#{total}" if total >= config[:warn].to_i && total < config[:critical].to_i
+    end
+  end
+
+  def generate_output
     if @crit.empty? && @warn.empty?
       ok
     elsif !@crit.empty?

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

@@ -1,7 +1,7 @@
 module SensuPluginsRabbitMQ
   module Version
     MAJOR = 2
-    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-rabbitmq
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-10 00:00:00.000000000 Z
+date: 2017-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: 1.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: 1.4.3
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement