sensu-plugins-zookeeper 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72c0c089bdf151003b5f21a405e2fa917840ef76
-  data.tar.gz: d3a5f610c72fb9d9ef6c331eacd18b2e584d4898
+  metadata.gz: 50c001e82c65e3b2c3b2ef17bd5fe991baede851
+  data.tar.gz: 6cf166d88e6baf96295af88f4dc4aca62281a172
 SHA512:
-  metadata.gz: 7ef6c1fdb309c82f192b9299f07f4423e5f5efa518411ca14e3ac4ab02868a6523f46c06ce1a3f233696f9c282a84a5519e7a0be6e357b77564e6202e1f07715
-  data.tar.gz: 5816a75806675c37e4e155eb3dafbe80c3ea694769bd2b42460dd64cc09901f5fcf866d554e0b1808cd62175b15b2056b30a050208e110608aa99545c861a6cd
+  metadata.gz: cd99cd108966f6d63b95ea904d5c3b888ee68f821931445fe2a076f2c50ca9c85ba8d91fe0cc77c887e5b4b893b9e071a0e0a32ee73ce68645c59affbcfeacb8
+  data.tar.gz: 8b74c06f883117c7db8278ce75b29535d89caf04a64c9940e6eacda87b1fad4bca896cd2a53177a542458145436587acecbd905bd51672386d735ddf7f288fc0

data/CHANGELOG.md

@@ -6,6 +6,13 @@ Which is based on [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
 
+## [1.4.0] - 2017-10-31
+### Added
+- Added zookeeper port option to metrics-zookeeper-cluster.rb
+
+### Fixed
+- Fixed a return bug in case of an error on metrics-zookeeper-cluster.rb
+
 ## [1.3.0] - 2017-09-09
 ### Added
 - metrics-zookeeper-cluster.rb: new script to gather metrics from a zookeeper cluster (@fsniper)
@@ -61,6 +68,7 @@ Which is based on [Keep A Changelog](http://keepachangelog.com/)
 - initial release
 
 [Unreleased]: https://github.com/sensu-plugins/sensu-plugins-zookeeper/compare/1.3.0...HEAD
+[1.4.0]: https://github.com/sensu-plugins/sensu-plugins-zookeeper/compare/1.3.0...1.4.0
 [1.3.0]: https://github.com/sensu-plugins/sensu-plugins-zookeeper/compare/1.2.0...1.3.0
 [1.2.0]: https://github.com/sensu-plugins/sensu-plugins-zookeeper/compare/1.1.0...1.2.0
 [1.1.0]: https://github.com/sensu-plugins/sensu-plugins-zookeeper/compare/1.0.0...1.1.0

data/bin/metrics-zookeeper-cluster.rb

@@ -25,6 +25,7 @@
 #
 
 require 'sensu-plugin/metric/cli'
+require 'sensu-plugins-zookeeper/version'
 require 'socket'
 require 'net/http'
 require 'json'
@@ -41,6 +42,13 @@ class ZookeeperMetrics < Sensu::Plugin::Metric::CLI::Graphite
          long: '--scheme SCHEME',
          default: 'zookeeper'
 
+  option :zk_port,
+         description: 'Zookeeper nodes\' listen port',
+         short: '-p port',
+         long: '--port port',
+         default: 2181,
+         proc: proc(&:to_i)
+
   def follow_url(uri_str, agent = "sensu-plugins-zookeeper/#{SensuPluginsZookeeper::Version::VER_STRING}", max_attempts = 10, timeout = 10)
     attempts = 0
     cookie = nil
@@ -102,7 +110,7 @@ class ZookeeperMetrics < Sensu::Plugin::Metric::CLI::Graphite
 
   def exhibitor_status
     response = follow_url(config[:exhibitor])
-    JSON.parse(response.body)
+    json = JSON.parse(response.body)
   rescue StandardError => e
     [false, json, ['exhibitor status is not http 200 ' + e.message]]
   end
@@ -113,7 +121,7 @@ class ZookeeperMetrics < Sensu::Plugin::Metric::CLI::Graphite
     json = exhibitor_status
     json.each do |zk|
       hostname = zk['hostname']
-      response  = zk_command(:mntr, hostname, 2181)
+      response  = zk_command(:mntr, hostname, config[:zk_port])
       metrics   = {}
 
       if response =~ /^zk_avg_latency\s*(\d+)$/

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

@@ -1,7 +1,7 @@
 module SensuPluginsZookeeper
   module Version
     MAJOR = 1
-    MINOR = 3
+    MINOR = 4
     PATCH = 0
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-zookeeper
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Sensu Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-09 00:00:00.000000000 Z
+date: 2017-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -217,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for zookeeper