sensu-plugins-rabbitmq 3.1.1 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed699b605f7a834ca8cf0052ca50eda76337f881
-  data.tar.gz: 04a21974523874b69f4555ef5b1f592cd88e1d7f
+  metadata.gz: b3566139d4b9ef5dce00928ee03a851735572fb0
+  data.tar.gz: 1e2b59c503c0e8fad702558068746944682500b5
 SHA512:
-  metadata.gz: 07e1ef662505c7ef3cb94d4d33beaf0ebbeec0c4730848db0bb3530eb2565e72aa2527b852fa0d634ef7ad8df11ad57a7f14b8d120f71225179613e84863f7a1
-  data.tar.gz: f79cd6141ccdc619274a2c8066fc76d7a55df64e0968f409429a2683c385c8a0841de10bb3162972b14a52e1c403a080e66420e5ca1da2970f6f53981c2efedd
+  metadata.gz: 21f1f3fc7372c3e79b7241d6cb7fb7867b39822c75e57a11c807d559c00fb7a10e7e62a6f560fe7cbdd9c8c7c8799d386bb96ae0761ddad09d66b2c72cf43a59
+  data.tar.gz: 66ee9067f134abc57fa81206f52adc7173b7f1190a792b90dc9155631601d522edf0a8fd899c921e5c07cc8500b0ff51d20358a804c7861e08ae7ea7d618a78c

data/CHANGELOG.md

@@ -1,9 +1,14 @@
-#Change Log
+# Change Log
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
+
+## [3.2.0] - 2017-06-20
+### Added
+ - metrics-rabbitmq-exchange: new metrics for exchange, working similarly to queue metrics (@rthouvenin)
+
 ## [3.1.1] - 2017-05-17
 ### Fixed
  - metrics-rabbitmq-queue.rb: Fix use of =~ operator
@@ -137,7 +142,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/3.1.1...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-rabbitmq/compare/3.2.0...HEAD
+[3.2.0]: https://github.com/sensu-plugins/sensu-plugins-rabbitmq/compare/3.1.1...3.2.0
 [3.1.1]: https://github.com/sensu-plugins/sensu-plugins-rabbitmq/compare/3.1.0...3.1.1
 [3.1.0]: https://github.com/sensu-plugins/sensu-plugins-rabbitmq/compare/3.0.0...3.1.0
 [3.0.0]: https://github.com/sensu-plugins/sensu-plugins-rabbitmq/compare/2.3.0...3.0.0

data/README.md

@@ -22,6 +22,7 @@
  * bin/check-rabbitmq-stomp-alive.rb
  * bin/metrics-rabbitmq-overview.rb
  * bin/metrics-rabbitmq-queue.rb
+ * bin/metrics-rabbitmq-exchange.rb
 
 ## Usage
 

data/bin/metrics-rabbitmq-exchange.rb

@@ -0,0 +1,144 @@
+#!/usr/bin/env ruby
+#  encoding: UTF-8
+#
+# RabbitMQ Exchange Metrics
+# ===
+#
+# DESCRIPTION:
+# This plugin gathers by default all the available exchange metrics.
+# The list of gathered metrics can also be specified with an option
+#
+# Code mostly copied from metrics-rabbitmq-queue
+#
+# PLATFORMS:
+#   Linux, BSD, Solaris
+#
+# DEPENDENCIES:
+#   RabbitMQ rabbitmq_management plugin
+#   gem: sensu-plugin
+#   gem: carrot-top
+#
+# LICENSE:
+# Copyright 2017 Romain Thouvenin <romain@thouvenin.pro>
+#
+# Released under the same terms as Sensu (the MIT license); see LICENSE
+# for details.
+
+require 'sensu-plugin/metric/cli'
+require 'socket'
+require 'carrot-top'
+require 'inifile'
+
+# main plugin class
+class RabbitMQExchangeMetrics < Sensu::Plugin::Metric::CLI::Graphite
+  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 :vhost,
+         description: 'Regular expression for filtering the RabbitMQ vhost',
+         short: '-v',
+         long: '--vhost VHOST'
+
+  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 :scheme,
+         description: 'Metric naming scheme, text to prepend to $exchange_name.$metric',
+         long: '--scheme SCHEME',
+         default: "#{Socket.gethostname}.rabbitmq"
+
+  option :filter,
+         description: 'Regular expression for filtering exchanges',
+         long: '--filter REGEX'
+
+  option :metrics,
+         description: 'Regular expression for filtering metrics in each exchange',
+         long: '--metrics REGEX'
+
+  option :ssl,
+         description: 'Enable SSL for connection to the API',
+         long: '--ssl',
+         boolean: true,
+         default: false
+
+  option :ini,
+         description: 'Configuration ini file',
+         short: '-i',
+         long: '--ini VALUE'
+
+  def acquire_rabbitmq_exchanges
+    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: username,
+        password: password,
+        ssl: config[:ssl]
+      )
+    rescue
+      warning 'could not get rabbitmq exchange info'
+    end
+
+    if config[:vhost]
+      return rabbitmq_info.exchanges.select { |x| x['vhost'].match(config[:vhost]) }
+    end
+
+    rabbitmq_info.exchanges
+  end
+
+  def dotted_keys(hash, prefix = '', keys = [])
+    hash.each do |k, v|
+      if v.is_a? Hash
+        keys = dotted_keys(v, prefix + k + '.', keys)
+      else
+        keys << prefix + k
+      end
+    end
+    keys
+  end
+
+  def run
+    timestamp = Time.now.to_i
+    acquire_rabbitmq_exchanges.each do |exchange|
+      if config[:filter]
+        next unless exchange['name'].match(config[:filter])
+      end
+
+      metrics = dotted_keys(exchange)
+      metrics.each do |metric|
+        if config[:metrics]
+          next unless metric.match(config[:metrics])
+        end
+        value = exchange.dig(*metric.split('.'))
+        output("#{config[:scheme]}.#{exchange['name']}.#{metric}", value, timestamp) unless value.nil?
+      end
+    end
+
+    ok
+  end
+end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-rabbitmq
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.2.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-17 00:00:00.000000000 Z
+date: 2017-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -252,6 +252,7 @@ executables:
 - check-rabbitmq-queue-drain-time.rb
 - check-rabbitmq-queue.rb
 - check-rabbitmq-stomp-alive.rb
+- metrics-rabbitmq-exchange.rb
 - metrics-rabbitmq-overview.rb
 - metrics-rabbitmq-queue.rb
 extensions: []
@@ -271,6 +272,7 @@ files:
 - bin/check-rabbitmq-queue-drain-time.rb
 - bin/check-rabbitmq-queue.rb
 - bin/check-rabbitmq-stomp-alive.rb
+- bin/metrics-rabbitmq-exchange.rb
 - bin/metrics-rabbitmq-overview.rb
 - bin/metrics-rabbitmq-queue.rb
 - lib/sensu-plugins-rabbitmq.rb