sensu-plugins-rabbitmq 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8eb5badf50c4f745ac09cb716158dc7d6ab7a3a7
-  data.tar.gz: 98f90e9fcb76d94b5cee47b154e9f3760fcb20ff
+  metadata.gz: 116dbb6b62aa64caac312e1343b5a936359bdee6
+  data.tar.gz: 498801298df6a8841e34dc46e09c95d0f01d387a
 SHA512:
-  metadata.gz: c3063c102232370b3a9d4183a6ec61b6cee8ed09c0b874ca573f0c5086252c270f08382a261964d34fdaad7712bbff4d59c60bdb5b9594e2caab5a2bfa6d474b
-  data.tar.gz: f99a565a841774932ae5f47acf1a4861fcea2b39bf99c0aaae8af054c681f2feb3361db7bd0a2ebac54949d60139c6776fed5e67b7127705b1006631e64f62e5
+  metadata.gz: d03370a0f1f389a551464da5e18c4d5bbb7581a6ef5710787e930dda4a045e0870daf24de019487fa4bc503c0b7a99c06f98eda12741eb1acd54002410bb805a
+  data.tar.gz: abe18f42bd43c449f4cd330ae47ae4496eb9e64d7e34e476c76180c0163ca7706a6019e471a70db8c42a073dd67a2d221d0c6f25fc1bfc3dc694c21fcf9a8b24

data/CHANGELOG.md

@@ -5,6 +5,13 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## [Unreleased]
 
+## [2.1.0] - 2017-01-10
+### Added
+ - check-rabbitmq-queue.rb: Added features for using regex in queue name and pretty output (@alexpekurovsky)
+
+### Fixed
+- check-rabbitmq-node-health: prevent fd check failing on OSX due to non-numeric fd_used (@thisisjaid)
+
 ## [2.0.0] - 2016-10-17
 ### Added
  - check-rabbitmq-queue-drain.rb: Added a default include-all value for the regex queue filter option
@@ -100,7 +107,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.0.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-rabbitmq/compare/2.1.0...HEAD
+[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
 [1.2.0]: https://github.com/sensu-plugins/sensu-plugins-rabbitmq/compare/1.1.0...1.2.0

data/bin/check-rabbitmq-node-health.rb

@@ -153,7 +153,10 @@ class CheckRabbitMQNodeHealth < Sensu::Plugin::Check::CLI
       # Determine % sockets consumed
       psocket = format('%.2f', nodeinfo['sockets_used'].fdiv(nodeinfo['sockets_total']) * 100)
       # Determine % file descriptors consumed
-      pfd = format('%.2f', nodeinfo['fd_used'].fdiv(nodeinfo['fd_total']) * 100)
+      # Non-numeric value fails silently to handle fd_used = 'unknown' on OSX
+      if nodeinfo['fd_used'].is_a?(Numeric)
+        pfd = format('%.2f', nodeinfo['fd_used'].fdiv(nodeinfo['fd_total']) * 100)
+      end
 
       # build status and message
       status = 'ok'

data/bin/check-rabbitmq-queue.rb

@@ -84,6 +84,18 @@ class CheckRabbitMQMessages < Sensu::Plugin::Check::CLI
          boolean: true,
          default: false
 
+  option :regex,
+         description: 'Use queue name as regex pattern',
+         long: '--regex',
+         boolean: true,
+         default: false
+
+  option :pretty,
+         description: 'Prints multiline message',
+         long: '--pretty',
+         boolean: true,
+         default: false
+
   def acquire_rabbitmq_info
     begin
       rabbitmq_info = CarrotTop.new(
@@ -105,27 +117,35 @@ class CheckRabbitMQMessages < Sensu::Plugin::Check::CLI
     rabbitmq = acquire_rabbitmq_info
     queues = rabbitmq.method_missing('/queues/' + config[:vhost])
     config[:queue].each do |q|
-      unless queues.map  { |hash| hash['name'] }.include? q
+      unless (queues.map { |hash| hash['name'] }.include?(q) && config[:regex] == false) || config[:regex] == true
         unless config[:ignore]
           @warn << "Queue #{q} not available"
         end
         next
       end
       queues.each do |queue|
-        next unless queue['name'] == q
+        next unless (queue['name'] == q && config[:regex] == false) || (queue['name'] =~ /#{q}/ && config[:regex] == true)
         total = queue['messages']
         total = 0 if total.nil?
         message total.to_s
-        @crit << "#{q}:#{total}" if total > config[:critical].to_i
-        @warn << "#{q}:#{total}" if total > config[:warn].to_i
+        @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
     if @crit.empty? && @warn.empty?
       ok
     elsif !@crit.empty?
-      critical "critical: #{@crit} warning: #{@warn}"
+      @message_output = "\n" + 'critical:' + "\n" + @crit.join("\n") if config[:pretty]
+      @message_output = "critical: #{@crit}" unless config[:pretty]
+      unless @warn.empty?
+        @message_output += "\n" + 'warning:' + "\n" + @warn.join("\n") if config[:pretty]
+        @message_output += " warning: #{@warn}" unless config[:pretty]
+      end
+      critical @message_output
     elsif !@warn.empty?
-      warning "critical: #{@crit} warning: #{@warn}"
+      @message_output = "\n" + 'warning:' + "\n" + @warn.join("\n") if config[:pretty]
+      @message_output = "warning: #{@warn}" unless config[:pretty]
+      warning @message_output
     end
   end
 end

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

@@ -1,7 +1,7 @@
 module SensuPluginsRabbitMQ
   module Version
     MAJOR = 2
-    MINOR = 0
+    MINOR = 1
     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.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-17 00:00:00.000000000 Z
+date: 2017-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -285,7 +285,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for rabbitmq