sensu-plugins-rabbitmq 5.1.0 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82e03ad3782930ed8f79782b6e87218024e8e111a1a4e230b117b0eac38f7bac
-  data.tar.gz: 7f4d9a9c9abb26b6f9ca9a9f28cbf12bbeae7f11e783ae1a5c63647bcf1948d8
+  metadata.gz: ed655870ff4e4af3f14482fe4a6998981a6c8112109ce5e8027b39c41d5debae
+  data.tar.gz: 444be0ee77dc6bf542b3a9659dbc999640ab3f3426b9ce7e5ead723ce87723e8
 SHA512:
-  metadata.gz: 5e47ea6fd59814ab95780c0d6290a9f9695124bc96d3dc8a06c3586ed8abe977223aed16839805d939d49f4c83fc7347a5dbcbc944a56ad80c3f35fa38f3840a
-  data.tar.gz: fdcdd2d46d097b84874a3bba58d2272a1ba7bc4f9d4feacf23e726dfba75dc458199a93dc967bcc0d798eaeed3bbd7e69e6d640a0786e80e0dd979a5e4a841bf
+  metadata.gz: a4e33b8c10125c3b023a18dc232974bae0f43626f3d37b6b53d9864362dd6bec691290930bcf404ed7f195f520c0acac0fbb6d85d9941a1c50b6fafcb491b736
+  data.tar.gz: ea28d295f7602113584830cb06ea4efc7dbf360fc4aa6bc32342638b043fa70f1f511a6488fb254956a9f2fae970848dd32d53f718e11472968f950171eae3c5

data/CHANGELOG.md

@@ -5,6 +5,10 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 
 ## [Unreleased]
 
+## [5.2.0] - 2018-05-16
+### Changed
+- check-rabbitmq-consumers.rb: Backport recommended code updates. Add consumer count to warn/critical message. (@monkey670)
+
 ## [5.1.0] - 2018-05-15
 ### Added
 - check-rabbitmq-consumer-utilisation.rb: Added new check for consumer utilisation. Seeded from check-rabbitmq-consumers.rb. (@monkey670)
@@ -200,7 +204,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/5.1.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-rabbitmq/compare/5.2.0...HEAD
+[5.2.0]:https://github.com/sensu-plugins/sensu-plugins-rabbitmq/\compare/5.1.0...5.2.0
 [5.1.0]: https://github.com/sensu-plugins/sensu-plugins-rabbitmq/compare/5.0.0...5.1.0
 [5.0.0]: https://github.com/sensu-plugins/sensu-plugins-rabbitmq/compare/4.1.1...5.0.0
 [4.1.1]: https://github.com/sensu-plugins/sensu-plugins-rabbitmq/compare/4.1.0...4.1.1

data/bin/check-rabbitmq-consumer-utilisation.rb

@@ -61,12 +61,6 @@ class CheckRabbitMQConsumerUtilisation < Sensu::Plugin::RabbitMQ::Check
          proc: proc(&:to_f),
          default: 0.5
 
-  def queue_list_builder(input)
-    return [] if input.nil?
-    return [input] if config[:regex]
-    input.split(',')
-  end
-
   def return_condition(missing, critical, warning)
     if critical.count > 0 || missing.count > 0
       message = []

data/bin/check-rabbitmq-consumers.rb

@@ -18,58 +18,29 @@
 # LICENSE:
 # Copyright 2014 Daniel Kerwin <d.kerwin@gini.net>
 # Copyright 2014 Tim Smith <tim@cozy.co>
+# Copyright 2018 Mike Murray <37150283+monkey670@users.noreply.github.com>
 #
 # Released under the same terms as Sensu (the MIT license); see LICENSE
 # for details.
 
-require 'sensu-plugin/check/cli'
-require 'carrot-top'
-require 'inifile'
+require 'sensu-plugins-rabbitmq'
+require 'sensu-plugins-rabbitmq/check'
 
 # main plugin class
-class CheckRabbitMQConsumers < Sensu::Plugin::Check::CLI
-  option :host,
-         description: 'RabbitMQ management API host',
-         long: '--host HOST',
-         default: 'localhost'
-
-  option :port,
-         description: 'RabbitMQ management API port',
-         long: '--port PORT',
-         proc: proc(&:to_i),
-         default: 15_672
-
-  option :ssl,
-         description: 'Enable SSL for connection to the API',
-         long: '--ssl',
+class CheckRabbitMQConsumers < Sensu::Plugin::RabbitMQ::Check
+  option :regex,
+         description: 'Treat the --queue flag as a regular expression.',
+         long: '--regex',
          boolean: true,
          default: false
 
-  option :username,
-         description: 'RabbitMQ management API user',
-         long: '--username USER',
-         default: 'guest'
-
-  option :password,
-         description: 'RabbitMQ management API password',
-         long: '--password PASSWORD',
-         default: 'guest'
-
   option :queue,
          description: 'Comma separated list of RabbitMQ queues to monitor.',
-         long: '--queue queue_name',
-         proc: proc { |q| q.split(',') }
+         long: '--queue queue_name'
 
   option :exclude,
          description: 'Comma separated list of RabbitMQ queues to NOT monitor.  All others will be monitored.',
-         long: '--exclude queue_name',
-         proc: proc { |q| q.split(',') }
-
-  option :regex,
-         description: 'Treat the --queue flag as a regular expression.',
-         long: '--regex',
-         boolean: true,
-         default: false
+         long: '--exclude queue_name'
 
   option :warn,
          short: '-w NUM_CONSUMERS',
@@ -85,43 +56,13 @@ class CheckRabbitMQConsumers < Sensu::Plugin::Check::CLI
          proc: proc(&:to_i),
          default: 2
 
-  option :ini,
-         description: 'Configuration ini file',
-         short: '-i',
-         long: '--ini VALUE'
-
-  def rabbit
-    begin
-      if config[:ini]
-        ini = IniFile.load(config[:ini])
-        section = ini['auth']
-        username = section['username']
-        password = section['password']
-      else
-        username = config[:username]
-        password = config[:password]
-      end
-
-      connection = CarrotTop.new(
-        host: config[:host],
-        port: config[:port],
-        user: username,
-        password: password,
-        ssl: config[:ssl]
-      )
-    rescue StandardError
-      warning 'could not connect to rabbitmq'
-    end
-    connection
-  end
-
   def return_condition(missing, critical, warning)
-    if critical.count.positive? || missing.count.positive?
-      message = ''
-      message << "Queues in critical state: #{critical.join(', ')}. " if critical.count.positive?
-      message << "Queues missing: #{missing.join(', ')}" if missing.count.positive?
-      critical(message)
-    elsif warning.count.positive?
+    if critical.count > 0 || missing.count > 0
+      message = []
+      message << "Queues in critical state: #{critical.join(', ')}. " if critical.count > 0
+      message << "Queues missing: #{missing.join(', ')}" if missing.count > 0
+      critical(message.join("\n"))
+    elsif warning.count > 0
       warning("Queues in warning state: #{warning.join(', ')}")
     else
       ok
@@ -129,30 +70,36 @@ class CheckRabbitMQConsumers < Sensu::Plugin::Check::CLI
   end
 
   def run
+    queue_list = queue_list_builder(config[:queue])
+    exclude_list = queue_list_builder(config[:exclude])
     # create arrays to hold failures
     missing = if config[:regex]
                 []
               else
-                config[:queue] || []
+                queue_list || []
               end
     critical = []
     warn = []
-
+    rabbitmq = acquire_rabbitmq_info
     begin
-      rabbit.queues.each do |queue|
+      rabbitmq.queues.each do |queue|
         # if specific queues were passed only monitor those.
         # if specific queues to exclude were passed then skip those
         if config[:regex]
-          next unless queue['name'] =~ /#{config[:queue].first}/
+          if config[:queue] && config[:exclude]
+            next unless queue['name'] =~ /#{queue_list.first}/ && queue['name'] !~ /#{exclude_list.first}/
+          else
+            next unless queue['name'] =~ /#{queue_list.first}/
+          end
         elsif config[:queue]
-          next unless config[:queue].include?(queue['name'])
+          next unless queue_list.include?(queue['name'])
         elsif config[:exclude]
-          next if config[:exclude].include?(queue['name'])
+          next if exclude_list.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]
+        critical.push("#{queue['name']}:#{queue['consumers']}-Consumers") if consumers <= config[:critical]
+        warn.push("#{queue['name']}:#{queue['consumers']}-Consumers") if consumers <= config[:warn]
       end
     rescue StandardError
       critical 'Could not find any queue, check rabbitmq server'

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

@@ -83,6 +83,12 @@ module Sensu
           result_info
         end
 
+        def queue_list_builder(input)
+          return [] if input.nil?
+          return [input] if config[:regex]
+          input.split(',')
+        end
+
         def self.included(receiver)
           receiver.extend(Sensu::Plugin::RabbitMQ::Options)
           receiver.add_common_options

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

@@ -3,7 +3,7 @@
 module SensuPluginsRabbitMQ
   module Version
     MAJOR = 5
-    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: 5.1.0
+  version: 5.2.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-16 00:00:00.000000000 Z
+date: 2018-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin