sensu-plugins-rabbitmq 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e453079e56150f58af45491d21d5fc38916a205e
-  data.tar.gz: f950b3fbdaa61d9713520e96b4e60e60d2f14b70
+  metadata.gz: fee6c8b3220c699cd8a25a9676c69366943abb4d
+  data.tar.gz: 7bc4d69c6d6b22a82246ae61263cb1ea8891127e
 SHA512:
-  metadata.gz: 1e172378beaff9e5b61f3c53acc4a24b6d508b749d549a797d2f60b20e3b0f9a5397a8771597a05b62f249606bfe9806891e3c7b2594b6da4deb69fbc4b3d75b
-  data.tar.gz: c093475fb6f88de2ed3c8364c5f39b833a24a1764ad6014c20fd5bceb2d41437c5c7f73f1bdc3807b1566a54bab62dad9a799858c2ec4d78c41fbe457ab88e33
+  metadata.gz: 13ea436d73f3fdb68befca4cf75b4ccf0d7a759f6027de5d587cb65b878814443d19f208b0d71ee3c610f0b5dcf9019f645a742b5912bedd50c11ce989e9a126
+  data.tar.gz: f3f9f75506bc3eacffd21e1f09e3758c7993236232af5f4a5c388c934064182e06604e5db6d3d98786a38c11326571f00b3a766a084bf274a468927e51960c55

data/CHANGELOG.md

@@ -5,7 +5,19 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## Unreleased
 
-## [0.0.3] - 2015-08-18
+## [0.1.0] - 2015-11-19
+### Changed
+- Upgrade to rubocop 0.32.1 and cleanup
+
+### Added
+- check-rabbitmq-queue.rb: Added option to ignore non-existent queues
+- check-rabbitmq-queue.rb: Added vhost support
+- Added SSL support to check-rabbitmq-cluster-health.rb and check-rabbitmq-node-health.rb
+
+### Fixed
+- metrics-rabbitmq-queue.rb: Fix error when queue['messages'] is missing
+
+## [0.0.4] - 2015-08-18
 ### Changed
 - pinned amq-protocol
 

data/README.md

@@ -1,6 +1,6 @@
 ## Sensu-Plugins-rabbitmq
 
-[ ![Build Status](https://travis-ci.org/sensu-plugins/sensu-plugins-rabbitmq.svg?branch=master)](https://travis-ci.org/sensu-plugins/sensu-plugins-rabbitmq)
+[![Build Status](https://travis-ci.org/sensu-plugins/sensu-plugins-rabbitmq.svg?branch=master)](https://travis-ci.org/sensu-plugins/sensu-plugins-rabbitmq)
 [![Gem Version](https://badge.fury.io/rb/sensu-plugins-rabbitmq.svg)](http://badge.fury.io/rb/sensu-plugins-rabbitmq)
 [![Code Climate](https://codeclimate.com/github/sensu-plugins/sensu-plugins-rabbitmq/badges/gpa.svg)](https://codeclimate.com/github/sensu-plugins/sensu-plugins-rabbitmq)
 [![Test Coverage](https://codeclimate.com/github/sensu-plugins/sensu-plugins-rabbitmq/badges/coverage.svg)](https://codeclimate.com/github/sensu-plugins/sensu-plugins-rabbitmq)
@@ -27,6 +27,6 @@
 
 ## Installation
 
-[Installation and Setup](https://github.com/sensu-plugins/documentation/blob/master/user_docs/installation_instructions.md)
+[Installation and Setup](http://sensu-plugins.io/docs/installation_instructions.html)
 
 ## Notes

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

@@ -61,6 +61,12 @@ class CheckRabbitMQCluster < Sensu::Plugin::Check::CLI
          long: '--nodes NODE1,NODE2',
          default: ''
 
+  option :ssl,
+         description: 'Enable SSL for connection to the API',
+         long: '--ssl',
+         boolean: true,
+         default: false
+
   def run
     res = cluster_healthy?
 
@@ -93,10 +99,12 @@ class CheckRabbitMQCluster < Sensu::Plugin::Check::CLI
     port     = config[:port]
     username = config[:username]
     password = config[:password]
-    nodes   =  config[:nodes].split(',')
+    ssl      = config[:ssl]
+    nodes    = config[:nodes].split(',')
 
     begin
-      resource = RestClient::Resource.new "http://#{host}:#{port}/api/nodes", username, password
+      ssl ? url_prefix = 'https' : url_prefix = 'http'
+      resource = RestClient::Resource.new "#{url_prefix}://#{host}:#{port}/api/nodes", username, password
       # create a hash of the server names and their running state
       servers_status = Hash[JSON.parse(resource.get).map { |server| [server['name'], server['running']] }]
 
@@ -113,7 +121,7 @@ class CheckRabbitMQCluster < Sensu::Plugin::Check::CLI
       else
         message = "#{failed_nodes.count} failed cluster node: #{failed_nodes.sort.join(',')}"
       end
-      message.prepend("#{missing_nodes.count } node(s) not found: #{missing_nodes.join(',')}. ") unless missing_nodes.empty?
+      message.prepend("#{missing_nodes.count} node(s) not found: #{missing_nodes.join(',')}. ") unless missing_nodes.empty?
       { 'status' => status, 'message' => message }
     rescue Errno::ECONNREFUSED => e
       { 'status' => 'critical', 'message' => e.message }

data/bin/check-rabbitmq-messages.rb

@@ -80,7 +80,7 @@ class CheckRabbitMQMessages < Sensu::Plugin::Check::CLI
          default: []
 
   def generate_message(status_hash)
-    message =  []
+    message = []
     status_hash.each_pair do |k, v|
       message << "#{k}: #{v}"
     end
@@ -111,8 +111,15 @@ class CheckRabbitMQMessages < Sensu::Plugin::Check::CLI
       crit_queues = {}
       rabbitmq.queues.each do |queue|
         next if config[:excluded].include?(queue['name'])
-        (crit_queues["#{queue['name']}"] = queue['messages']; next) if queue['messages'] >= config[:critical].to_i # rubocop: disable Style/Semicolon
-        (warn_queues["#{queue['name']}"] = queue['messages']; next) if queue['messages'] >= config[:warn].to_i # rubocop: disable Style/Semicolon
+        queue['messages'] ||= 0
+        if queue['messages'] >= config[:critical].to_i
+          crit_queues["#{queue['name']}"] = queue['messages']
+          next
+        end
+        if queue['messages'] >= config[:warn].to_i
+          warn_queues["#{queue['name']}"] = queue['messages']
+          next
+        end
       end
       message crit_queues.empty? ? generate_message(warn_queues) : generate_message(crit_queues)
       critical unless crit_queues.empty?

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

@@ -55,6 +55,12 @@ class CheckRabbitMQNodeHealth < Sensu::Plugin::Check::CLI
          long: '--port PORT',
          default: '15672'
 
+  option :ssl,
+         description: 'Enable SSL for connection to the API',
+         long: '--ssl',
+         boolean: true,
+         default: false
+
   option :memwarn,
          description: 'Warning % of mem usage vs high watermark',
          short: '-m',
@@ -122,9 +128,11 @@ class CheckRabbitMQNodeHealth < Sensu::Plugin::Check::CLI
     port     = config[:port]
     username = config[:username]
     password = config[:password]
+    ssl      = config[:ssl]
 
     begin
-      resource = RestClient::Resource.new "http://#{host}:#{port}/api/nodes", username, password
+      ssl ? url_prefix = 'https' : url_prefix = 'http'
+      resource = RestClient::Resource.new "#{url_prefix}://#{host}:#{port}/api/nodes", username, password
       # Parse our json data
       nodeinfo = JSON.parse(resource.get)[0]
 

data/bin/check-rabbitmq-queue-drain-time.rb

@@ -103,7 +103,7 @@ class CheckRabbitMQQueueDrainTime < Sensu::Plugin::Check::CLI
 
       # handle rate of zero which is an infinite time until empty
       if queue['backing_queue_status']['avg_egress_rate'].to_f == 0
-        crit_queues[queue['name']]  = 'Infinite (drain rate = 0)'
+        crit_queues[queue['name']] = 'Infinite (drain rate = 0)'
         next
       end
 

data/bin/check-rabbitmq-queue.rb

@@ -38,6 +38,12 @@ class CheckRabbitMQMessages < Sensu::Plugin::Check::CLI
          proc: proc(&:to_i),
          default: 15_672
 
+  option :vhost,
+         description: 'RabbitMQ vhost',
+         short: '-v',
+         long: '--vhost VHOST',
+         default: '%2F'
+
   option :ssl,
          description: 'Enable SSL for connection to the API',
          long: '--ssl',
@@ -72,6 +78,12 @@ class CheckRabbitMQMessages < Sensu::Plugin::Check::CLI
          description: 'CRITICAL message count threshold',
          default: 500
 
+  option :ignore,
+         description: 'Ignore non-existent queues',
+         long: '--ignore',
+         boolean: true,
+         default: false
+
   def acquire_rabbitmq_info
     begin
       rabbitmq_info = CarrotTop.new(
@@ -91,10 +103,12 @@ class CheckRabbitMQMessages < Sensu::Plugin::Check::CLI
     @crit = []
     @warn = []
     rabbitmq = acquire_rabbitmq_info
-    queues = rabbitmq.queues
+    queues = rabbitmq.method_missing('/queues/' + config[:vhost])
     config[:queue].each do |q|
       unless queues.map  { |hash| hash['name'] }.include? q
-        @warn << "Queue #{ q } not available"
+        unless config[:ignore]
+          @warn << "Queue #{q} not available"
+        end
         next
       end
       queues.each do |queue|
@@ -102,16 +116,16 @@ class CheckRabbitMQMessages < Sensu::Plugin::Check::CLI
         total = queue['messages']
         total = 0 if total.nil?
         message "#{total}"
-        @crit << "#{ q }:#{ total }" if total > config[:critical].to_i
-        @warn << "#{ q }:#{ total }" if total > config[:warn].to_i
+        @crit << "#{q}:#{total}" if total > config[:critical].to_i
+        @warn << "#{q}:#{total}" if total > config[:warn].to_i
       end
     end
     if @crit.empty? && @warn.empty?
       ok
     elsif !(@crit.empty?)
-      critical "critical: #{ @crit } warning: #{ @warn }"
+      critical "critical: #{@crit} warning: #{@warn}"
     elsif !(@warn.empty?)
-      warning "critical: #{ @crit } warning: #{ @warn }"
+      warning "critical: #{@crit} warning: #{@warn}"
     end
   end
 end

data/bin/check-rabbitmq-stomp-alive.rb

@@ -98,10 +98,10 @@ class CheckRabbitStomp < Sensu::Plugin::Check::CLI
       conn.subscribe("/queue/#{config[:queue]}") do |_msg|
       end
       { 'status' => 'ok', 'message' => 'RabbitMQ server is alive' }
-     rescue Errno::ECONNREFUSED
-       { 'status' => 'critical', 'message' => 'TCP connection refused' }
-     rescue Stomp::Error::BrokerException => e
-       { 'status' => 'critical', 'message' => "Error from broker. Check auth details? #{e.message}" }
+    rescue Errno::ECONNREFUSED
+      { 'status' => 'critical', 'message' => 'TCP connection refused' }
+    rescue Stomp::Error::BrokerException => e
+      { 'status' => 'critical', 'message' => "Error from broker. Check auth details? #{e.message}" }
     rescue => e
       { 'status' => 'unknown', 'message' => "#{e.class}: #{e.message}" }
     end

data/bin/metrics-rabbitmq-queue.rb

@@ -91,8 +91,9 @@ class RabbitMQMetrics < Sensu::Plugin::Metric::CLI::Graphite
       end
 
       # calculate and output time till the queue is drained in drain metrics
+      queue['messages'] ||= 0
       drain_time = queue['messages'] / queue['backing_queue_status']['avg_egress_rate']
-      drain_time = 0 if drain_time.nan? # 0 rate with 0 messages is 0 time to drain
+      drain_time = 0 if drain_time.nan? || drain_time.infinite? # 0 rate with 0 messages is 0 time to drain
       output([config[:scheme], queue['name'], 'drain_time'].join('.'), drain_time.to_i, timestamp)
 
       %w(messages consumers).each do |metric|

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

@@ -1,8 +1,8 @@
 module SensuPluginsRabbitMQ
   module Version
     MAJOR = 0
-    MINOR = 0
-    PATCH = 4
+    MINOR = 1
+    PATCH = 0
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-rabbitmq
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
@@ -30,7 +30,7 @@ cert_chain:
   8sHuVruarogxxKPBzlL2is4EUb6oN/RdpGx2l4254+nyR+abg//Ed27Ym0PkB4lk
   HP0m8WSjZmFr109pE/sVsM5jtOCvogyujQOjNVGN4gz1wwPr
   -----END CERTIFICATE-----
-date: 2015-08-18 00:00:00.000000000 Z
+date: 2015-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -136,14 +136,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: 0.32.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: 0.32.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -242,7 +242,11 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
-description: Sensu plugins for rabbitmq
+description: |-
+  This plugin provides native RabbitMQ instrumentation
+                                for monitoring and metrics collection, including:
+                                service health, message, consumer, and queue health/metrics
+                                via `rabbitmq_management`, and more
 email: "<sensu-users@googlegroups.com>"
 executables:
 - metrics-rabbitmq-queue.rb

metadata.gz.sig

@@ -1 +1 @@
- ��˱&�l��v�W����1���D��%��}�'�<֖��19�MJ]r��uL*����4��&�s��m��CR���~��~�?��D��'��2ej�K'�{�}�{�@�L�Z����W\a�������������n�8�h���?�l}�U/�Y~Jӟd��~R���v�������k��Ls6�5E��ըe����.��j�gN;�.�d��r.�d>\Js^yB�
+��إ�Fys:�\���@�P@`k����@��aJW�e:`���U�
�0~��:A��7
�i4�'g�^��[o���e�^S�e��-^#ݚR��p����UW�� �w~�ᇄN�g�| ylԊu��{qR/�A���܎�u1 ��N�sIS{����o))����x&��&Cۇ�w'bĈ�0]m��떠{��"wk��Y�Y~t��2S�����]�4\�z=��w� �s*N�L+r��*M� ��FL��b�;q