sensu-plugins-rabbitmq 2.3.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ffa72e143a7268373707912633c755281f22509
-  data.tar.gz: b8f03aa9b79d13d2cba68e43c1682bf39aa79bee
+  metadata.gz: 4136a3c48a94763e3ab822775e4d21a832b10887
+  data.tar.gz: eab91431b9a3e361e955f23ed3c383d7832344fb
 SHA512:
-  metadata.gz: e11e6b6cf34a8c0af5af7831250f07f29d662484fd598a525159a6aa01b24aa70202883121cfa7d5e752442c07172d3664ee0d6e974ec94d531760f8abf04003
-  data.tar.gz: 6824effe3ac2cff5c8e67867df1a0ddf850da3a749ec5ab872ccc7ee4440a16034a3b515c245a4d976f6a5594e813e62c4b4d68309de89bab54f736a2aae0233
+  metadata.gz: e8b04c93a18c80b25bf0ea1f1025d7f1d0ca24facd5802a71f758afa1d1dbfe00b8a8a471fbcb6115c1e4a261c052c77566dd3f09343064abf3c682ee3b32756
+  data.tar.gz: da132f2cc3c15f1f22dc1280d9192f6f800aa50f612c503de942d60321e0d7375996092b2d00ac2429c62fd0a514323586b7a7908b1db1a7bcdc188bae693359

data/CHANGELOG.md

@@ -4,11 +4,18 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
-### [2.3.0] - 2017-05-09
+## [3.0.0] - 2017-05-10
+### Breaking change
+ - Previously some checks used --user to specify username, now all scripts use --username
+
+### Added
+ - --ini option for all checks to specify username and password in a config file (@bootswithdefer)
+
+## [2.3.0] - 2017-05-09
 ### Added
 - check-rabbitmq-node-usage.rb: added new check to look at rmq node resource useage. (@DvaBearqLoza)
 
-### [2.2.0] - 2017-05-08
+## [2.2.0] - 2017-05-08
 ### Added
  - check-rabbitmq-queue.rb: Added --below feature to specify if value below threshold should generate alert (@alexpekurovsky)
 
@@ -122,7 +129,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.3.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-rabbitmq/compare/3.0.0...HEAD
+[3.0.0]: https://github.com/sensu-plugins/sensu-plugins-rabbitmq/compare/2.3.0...3.0.0
 [2.3.0]: https://github.com/sensu-plugins/sensu-plugins-rabbitmq/compare/2.2.0...2.3.0
 [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

data/bin/check-rabbitmq-alive.rb

@@ -24,6 +24,7 @@
 require 'sensu-plugin/check/cli'
 require 'json'
 require 'rest_client'
+require 'inifile'
 
 # main plugin class
 class CheckRabbitMQAlive < Sensu::Plugin::Check::CLI
@@ -69,6 +70,11 @@ class CheckRabbitMQAlive < Sensu::Plugin::Check::CLI
          boolean: true,
          default: false
 
+  option :ini,
+         description: 'Configuration ini file',
+         short: '-i',
+         long: '--ini VALUE'
+
   def run
     res = vhost_alive?
 
@@ -84,11 +90,18 @@ class CheckRabbitMQAlive < Sensu::Plugin::Check::CLI
   def vhost_alive?
     host       = config[:host]
     port       = config[:port]
-    username   = config[:username]
-    password   = config[:password]
     vhost      = config[:vhost]
     ssl        = config[:ssl]
     verify_ssl = config[:verify_ssl_off]
+    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
 
     begin
       resource = RestClient::Resource.new(

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

@@ -22,6 +22,7 @@
 
 require 'sensu-plugin/check/cli'
 require 'bunny'
+require 'inifile'
 
 # main plugin class
 class CheckRabbitAMQPAlive < Sensu::Plugin::Check::CLI
@@ -77,6 +78,11 @@ class CheckRabbitAMQPAlive < Sensu::Plugin::Check::CLI
          boolean: true,
          default: true
 
+  option :ini,
+         description: 'Configuration ini file',
+         short: '-i',
+         long: '--ini VALUE'
+
   def run
     res = vhost_alive?
 
@@ -92,13 +98,20 @@ class CheckRabbitAMQPAlive < Sensu::Plugin::Check::CLI
   def vhost_alive?
     host           = config[:host]
     port           = config[:port]
-    username       = config[:username]
-    password       = config[:password]
     vhost          = config[:vhost]
     ssl            = config[:ssl]
     tls_cert       = config[:tls_cert]
     tls_key        = config[:tls_key]
     no_verify_peer = config[:no_verify_peer]
+    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
 
     begin
       conn = Bunny.new("amqp#{ssl ? 's' : ''}://#{username}:#{password}@#{host}:#{port}/#{vhost}",

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

@@ -28,6 +28,7 @@
 require 'sensu-plugin/check/cli'
 require 'json'
 require 'rest_client'
+require 'inifile'
 
 # main plugin class
 class CheckRabbitMQCluster < Sensu::Plugin::Check::CLI
@@ -78,6 +79,11 @@ class CheckRabbitMQCluster < Sensu::Plugin::Check::CLI
          long: '--ssl_ca_file CA_PATH',
          default: ''
 
+  option :ini,
+         description: 'Configuration ini file',
+         short: '-i',
+         long: '--ini VALUE'
+
   def run
     res = cluster_healthy?
 
@@ -108,12 +114,19 @@ class CheckRabbitMQCluster < Sensu::Plugin::Check::CLI
   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(',')
     ssl_ca_file = config[:ssl_ca_file]
+    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
 
     begin
       url_prefix = ssl ? 'https' : 'http'

data/bin/check-rabbitmq-consumers.rb

@@ -24,6 +24,7 @@
 
 require 'sensu-plugin/check/cli'
 require 'carrot-top'
+require 'inifile'
 
 # main plugin class
 class CheckRabbitMQConsumers < Sensu::Plugin::Check::CLI
@@ -44,9 +45,9 @@ class CheckRabbitMQConsumers < Sensu::Plugin::Check::CLI
          boolean: true,
          default: false
 
-  option :user,
+  option :username,
          description: 'RabbitMQ management API user',
-         long: '--user USER',
+         long: '--username USER',
          default: 'guest'
 
   option :password,
@@ -78,13 +79,28 @@ 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: config[:user],
-        password: config[:password],
+        user: username,
+        password: password,
         ssl: config[:ssl]
       )
     rescue

data/bin/check-rabbitmq-messages.rb

@@ -25,6 +25,7 @@
 require 'sensu-plugin/check/cli'
 require 'socket'
 require 'carrot-top'
+require 'inifile'
 
 # main plugin class
 class CheckRabbitMQMessages < Sensu::Plugin::Check::CLI
@@ -39,9 +40,9 @@ class CheckRabbitMQMessages < Sensu::Plugin::Check::CLI
          proc: proc(&:to_i),
          default: 15_672
 
-  option :user,
+  option :username,
          description: 'RabbitMQ management API user',
-         long: '--user USER',
+         long: '--username USER',
          default: 'guest'
 
   option :password,
@@ -79,6 +80,11 @@ class CheckRabbitMQMessages < Sensu::Plugin::Check::CLI
          proc: proc { |q| q.split(',') },
          default: []
 
+  option :ini,
+         description: 'Configuration ini file',
+         short: '-i',
+         long: '--ini VALUE'
+
   def generate_message(status_hash)
     message = []
     status_hash.each_pair do |k, v|
@@ -89,11 +95,21 @@ class CheckRabbitMQMessages < Sensu::Plugin::Check::CLI
 
   def acquire_rabbitmq_info
     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
+
       rabbitmq_info = CarrotTop.new(
         host: config[:host],
         port: config[:port],
-        user: config[:user],
-        password: config[:password],
+        user: username,
+        password: password,
         ssl: config[:ssl]
       )
     rescue

data/bin/check-rabbitmq-network-partitions.rb

@@ -24,6 +24,7 @@
 
 require 'sensu-plugin/check/cli'
 require 'carrot-top'
+require 'inifile'
 
 # main plugin class
 class CheckRabbitMQPartitions < Sensu::Plugin::Check::CLI
@@ -57,6 +58,11 @@ class CheckRabbitMQPartitions < Sensu::Plugin::Check::CLI
          boolean: true,
          default: false
 
+  option :ini,
+         description: 'Configuration ini file',
+         short: '-i',
+         long: '--ini VALUE'
+
   def run
     critical 'network partition detected' if partition?
     ok 'no network partition detected'
@@ -71,11 +77,21 @@ class CheckRabbitMQPartitions < Sensu::Plugin::Check::CLI
   end
 
   def rabbitmq_management
+    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
+
     CarrotTop.new(
       host: config[:host],
       port: config[:port],
-      user: config[:username],
-      password: config[:password],
+      user: username,
+      password: password,
       ssl: config[:ssl]
     )
   end

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

@@ -28,6 +28,7 @@
 require 'sensu-plugin/check/cli'
 require 'json'
 require 'rest_client'
+require 'inifile'
 
 # main plugin class
 class CheckRabbitMQNodeHealth < Sensu::Plugin::Check::CLI
@@ -115,6 +116,11 @@ class CheckRabbitMQNodeHealth < Sensu::Plugin::Check::CLI
          long: '--alarms BOOLEAN',
          default: 'true'
 
+  option :ini,
+         description: 'Configuration ini file',
+         short: '-i',
+         long: '--ini VALUE'
+
   def run
     res = node_healthy?
 
@@ -136,6 +142,15 @@ class CheckRabbitMQNodeHealth < Sensu::Plugin::Check::CLI
     password   = config[:password]
     ssl        = config[:ssl]
     verify_ssl = config[:verify_ssl_off]
+    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
 
     begin
       url_prefix = ssl ? 'https' : 'http'

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

@@ -34,6 +34,7 @@
 
 require 'sensu-plugin/check/cli'
 require 'carrot-top'
+require 'inifile'
 
 # Main plugin class
 class CheckRabbitMQNodeUsage < Sensu::Plugin::Check::CLI
@@ -143,6 +144,11 @@ class CheckRabbitMQNodeUsage < Sensu::Plugin::Check::CLI
          proc: proc(&:to_f),
          default: 90
 
+  option :ini,
+         description: 'Configuration ini file',
+         short: '-i',
+         long: '--ini VALUE'
+
   def run
     res = node_healthy?
 
@@ -293,11 +299,21 @@ class CheckRabbitMQNodeUsage < Sensu::Plugin::Check::CLI
   end
 
   def rabbitmq_management
+    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
+
     CarrotTop.new(
       host: config[:host],
       port: config[:port],
-      user: config[:username],
-      password: config[:password],
+      user: username,
+      password: password,
       ssl: config[:ssl]
     )
   end

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

@@ -29,6 +29,7 @@
 require 'sensu-plugin/check/cli'
 require 'socket'
 require 'carrot-top'
+require 'inifile'
 
 # main plugin class
 class CheckRabbitMQQueueDrainTime < Sensu::Plugin::Check::CLI
@@ -48,9 +49,9 @@ class CheckRabbitMQQueueDrainTime < Sensu::Plugin::Check::CLI
          short: '-v',
          long: '--vhost VHOST'
 
-  option :user,
+  option :username,
          description: 'RabbitMQ management API user',
-         long: '--user USER',
+         long: '--username USER',
          default: 'guest'
 
   option :password,
@@ -81,13 +82,28 @@ class CheckRabbitMQQueueDrainTime < Sensu::Plugin::Check::CLI
          description: 'CRITICAL time that messages will process at current rate',
          default: 360
 
+  option :ini,
+         description: 'Configuration ini file',
+         short: '-i',
+         long: '--ini VALUE'
+
   def acquire_rabbitmq_queues
     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
+
       rabbitmq_info = CarrotTop.new(
         host: config[:host],
         port: config[:port],
-        user: config[:user],
-        password: config[:password],
+        user: username,
+        password: password,
         ssl: config[:ssl]
       )
     rescue

data/bin/check-rabbitmq-queue.rb

@@ -24,6 +24,7 @@
 require 'sensu-plugin/check/cli'
 require 'socket'
 require 'carrot-top'
+require 'inifile'
 
 # main plugin class
 class CheckRabbitMQMessages < Sensu::Plugin::Check::CLI
@@ -50,9 +51,9 @@ class CheckRabbitMQMessages < Sensu::Plugin::Check::CLI
          boolean: true,
          default: false
 
-  option :user,
+  option :username,
          description: 'RabbitMQ management API user',
-         long: '--user USER',
+         long: '--username USER',
          default: 'guest'
 
   option :password,
@@ -102,13 +103,28 @@ class CheckRabbitMQMessages < Sensu::Plugin::Check::CLI
          boolean: true,
          default: false
 
+  option :ini,
+         description: 'Configuration ini file',
+         short: '-i',
+         long: '--ini VALUE'
+
   def acquire_rabbitmq_info
     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
+
       rabbitmq_info = CarrotTop.new(
         host: config[:host],
         port: config[:port],
-        user: config[:user],
-        password: config[:password],
+        user: username,
+        password: password,
         ssl: config[:ssl]
       )
     rescue

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

@@ -26,6 +26,7 @@
 
 require 'sensu-plugin/check/cli'
 require 'stomp'
+require 'inifile'
 
 # main plugin class
 class CheckRabbitStomp < Sensu::Plugin::Check::CLI
@@ -65,6 +66,11 @@ class CheckRabbitStomp < Sensu::Plugin::Check::CLI
          long: '--queue QUEUE',
          default: 'aliveness-test'
 
+  option :ini,
+         description: 'Configuration ini file',
+         short: '-i',
+         long: '--ini VALUE'
+
   def run
     res = vhost_alive?
 
@@ -78,11 +84,21 @@ class CheckRabbitStomp < Sensu::Plugin::Check::CLI
   end
 
   def vhost_alive?
+    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
+
     hash = {
       hosts: [
         {
-          login: config[:username],
-          passcode: config[:password],
+          login: username,
+          passcode: password,
           host: config[:host],
           port: config[:port],
           ssl: config[:ssl]

data/bin/metrics-rabbitmq-overview.rb

@@ -39,6 +39,7 @@
 require 'sensu-plugin/metric/cli'
 require 'socket'
 require 'carrot-top'
+require 'inifile'
 
 # main plugin class
 class RabbitMQMetrics < Sensu::Plugin::Metric::CLI::Graphite
@@ -53,9 +54,9 @@ class RabbitMQMetrics < Sensu::Plugin::Metric::CLI::Graphite
          proc: proc(&:to_i),
          default: 15_672
 
-  option :user,
+  option :username,
          description: 'RabbitMQ management API user',
-         long: '--user USER',
+         long: '--username USER',
          default: 'guest'
 
   option :password,
@@ -74,13 +75,28 @@ class RabbitMQMetrics < Sensu::Plugin::Metric::CLI::Graphite
          boolean: true,
          default: false
 
+  option :ini,
+         description: 'Configuration ini file',
+         short: '-i',
+         long: '--ini VALUE'
+
   def acquire_rabbitmq_info
     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
+
       rabbitmq_info = CarrotTop.new(
         host: config[:host],
         port: config[:port],
-        user: config[:user],
-        password: config[:password],
+        user: username,
+        password: password,
         ssl: config[:ssl]
       )
     rescue

data/bin/metrics-rabbitmq-queue.rb

@@ -29,6 +29,7 @@
 require 'sensu-plugin/metric/cli'
 require 'socket'
 require 'carrot-top'
+require 'inifile'
 
 # main plugin class
 class RabbitMQMetrics < Sensu::Plugin::Metric::CLI::Graphite
@@ -48,9 +49,9 @@ class RabbitMQMetrics < Sensu::Plugin::Metric::CLI::Graphite
          short: '-v',
          long: '--vhost VHOST'
 
-  option :user,
+  option :username,
          description: 'RabbitMQ management API user',
-         long: '--user USER',
+         long: '--username USER',
          default: 'guest'
 
   option :password,
@@ -73,13 +74,28 @@ class RabbitMQMetrics < Sensu::Plugin::Metric::CLI::Graphite
          boolean: true,
          default: false
 
+  option :ini,
+         description: 'Configuration ini file',
+         short: '-i',
+         long: '--ini VALUE'
+
   def acquire_rabbitmq_queues
     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
+
       rabbitmq_info = CarrotTop.new(
         host: config[:host],
         port: config[:port],
-        user: config[:user],
-        password: config[:password],
+        user: username,
+        password: password,
         ssl: config[:ssl]
       )
     rescue

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

@@ -1,7 +1,7 @@
 module SensuPluginsRabbitMQ
   module Version
-    MAJOR = 2
-    MINOR = 3
+    MAJOR = 3
+    MINOR = 0
     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.3.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-09 00:00:00.000000000 Z
+date: 2017-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -94,6 +94,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.0.1
+- !ruby/object:Gem::Dependency
+  name: inifile
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement