sensu-plugins-rabbitmq 1.2.0 → 1.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Yzg5YjVhMTQzMDhjZDQwYzU0NTZjMDU2YjdhNTZjYTAzYTY1NzM2NQ==
+    Y2E4YmQyOTI5YjI5YzMwNTRkOTA1MmU4YWQ1ZTliNzdlNjVhM2RkNQ==
   data.tar.gz: !binary |-
-    MWYzMDVjYWI0YjkyYmNjOWJlNDZkMjliOTdhMGM2NTUxZWUwZjgwOA==
+    MzAwMWYyY2MxZDExZTQ0ZjQ1OTFmZDBkMTk1ZDg1MmI1MjE2MmFiMA==
 SHA512:
   metadata.gz: !binary |-
-    MGVlYmZjYTliZDI1ZWEwZjM2MzI1MTZlOGY2ZjY4MTBhNTIzNmIzMmVjZmUw
-    OGU3MGUxMmUyZmQzYjVlMDc3MzlmZWI0ZDcyZWNkNjM3NmZhM2EwYTRhNGU5
-    YTcyMzUxODgwMjc1ZTRiNjNkNTMzMTFkMjAyZGFhODk2OGZjYTY=
+    MmExNWE1ZDg1NTEwNjYzNGYyNDUyZmM0Mzc5NjczYTJkNTMxYTcwMDdkODdk
+    ZmRiN2QwNjFjZTIwMDYzNjA2YzE3NWNlNmY5ZTlmMjc0NWQ4ODU2YTFlNGNk
+    NWQwNzM1OTEzY2ViYWNmYmY4MjZmYjg4MzE1ODBjOWMyMGZiMzk=
   data.tar.gz: !binary |-
-    OGIwYTNjMDU3NDg2MTM1ZDUzM2U3ZGZmOWIzOWQwOTYyODNhYmQxZDM0MTgz
-    NzQwOGFlNzYyNTI2MjY0YTdlZTM2OTI4MTUyYzJjOWY1NGZjZjUzN2IyNjIw
-    NzJiNGViYTU3N2VlOGZiMjBiMGY1NTBlYzEwNjMxMTA5MDY5ODQ=
+    MmNhNDdjODhmOTIyZWJmODExZTQwYjg3NWE2ZTFhZjY1NGRiZTJiMWU5NTVl
+    ZTczMGIyMjIzYTgxMjI3ZmQwYmVhMTc0MTg3MTk3MDFkNjE5YmM1N2E0MDI3
+    NzFiN2U5NTE5MTZiMWM3ZWNkNWQwZTRjMWEzZDE4YmIwMGJhNTY=

data/CHANGELOG.md

@@ -5,9 +5,16 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## [Unreleased]
 
+## [1.3.0] - 2016-04-13
+### Added
+- check-rabbitmq-cluster-health.rb: Added option to provide SSL CA certificate
+
+### Changed
+- set dep on sensu-plugin gem to be more relaxed
+
 ## [1.2.0] - 2016-04-13
 ### Added
-- check-rabbitmq-amqp-alive.rb: Added support for TLS authentication 
+- check-rabbitmq-amqp-alive.rb: Added support for TLS authentication
 - metrics-rabbitmq-queue.rb: Added option to filter vhost with regular expression
 - Added option to skip SSL cert checking
 
@@ -78,7 +85,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/1.2.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-rabbitmq/compare/1.3.0...HEAD
+[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
 [1.1.0]: https://github.com/sensu-plugins/sensu-plugins-rabbitmq/compare/1.0.0...1.1.0
 [1.0.0]: https://github.com/sensu-plugins/sensu-plugins-rabbitmq/compare/0.1.0...1.0.0

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

@@ -73,6 +73,11 @@ class CheckRabbitMQCluster < Sensu::Plugin::Check::CLI
          boolean: true,
          default: false
 
+  option :ssl_ca_file,
+         description: 'Path to SSL CA .crt',
+         long: '--ssl_ca_file CA_PATH',
+         default: ''
+
   def run
     res = cluster_healthy?
 
@@ -101,21 +106,27 @@ class CheckRabbitMQCluster < Sensu::Plugin::Check::CLI
   end
 
   def cluster_healthy?
-    host       = config[:host]
-    port       = config[:port]
-    username   = config[:username]
-    password   = config[:password]
-    ssl        = config[:ssl]
-    verify_ssl = config[:verify_ssl_off]
-    nodes      = config[:nodes].split(',')
+    host        = config[:host]
+    port        = config[:port]
+    username    = config[:username]
+    password    = config[:password]
+    ssl         = config[:ssl]
+    verify_ssl  = config[:verify_ssl_off]
+    nodes       = config[:nodes].split(',')
+    ssl_ca_file = config[:ssl_ca_file]
 
     begin
       url_prefix = ssl ? 'https' : 'http'
-      resource = RestClient::Resource.new(
-        "#{url_prefix}://#{host}:#{port}/api/nodes",
+      options = {
         user: username,
         password: password,
         verify_ssl: !verify_ssl
+      }
+      options[:ssl_ca_file] = ssl_ca_file unless ssl_ca_file.empty?
+
+      resource = RestClient::Resource.new(
+        "#{url_prefix}://#{host}:#{port}/api/nodes",
+        options
       )
       # create a hash of the server names and their running state
       servers_status = Hash[JSON.parse(resource.get).map { |server| [server['name'], server['running']] }]

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

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

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-rabbitmq
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-13 00:00:00.000000000 Z
+date: 2016-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: carrot-top
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.37'
+        version: 0.40.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.37'
+        version: 0.40.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement