sensu-plugins-zookeeper 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfa8a78004fae9e11f38490aef5c5c8e09f3cc4a4b613b5099eb495e47805d0b
-  data.tar.gz: aa41d17de0b05b8487d52ac80e58094c77c725466b67dc74f7df2f232dc8b14b
+  metadata.gz: fbff5ca8017a67540ee0e3460626562dd1e584aa882bbf1ecd5d16c7853528ef
+  data.tar.gz: 782756085bfbc2284ae6f9a2bd05346a8c984c2c28b3224f9975a3191bfb59c4
 SHA512:
-  metadata.gz: 9e93f3edf92996b15cf7a90f34228093b15b70dc06ba73b2b902fe638dad21f7d325fdb9636ccaf1aa79902d88ce58d68d7e5b1f0cb55caf8d8198104cd1861c
-  data.tar.gz: d486f4a0f8e405575db2116792f12aea2d7078ce9cc93cac3263ed38ae7b86458d087d65d24a59d652af5d404e1d7873e46c72e9074e73f08b6a4e756ed1253f
+  metadata.gz: 00c793488c17da38a9f7be98d49769a30eec26691f24a2439487b6964079dffa98697a27894494075fd8fb35753601904c8a39d35fc6d4f45d263fa050d8f587
+  data.tar.gz: c14da55994f9d5e221edf89278a94170eba0e5fa4acc15b4ec03b07595c4d68fd4b7fe4b3044f1621f66c7028335fc15112595c42554ee31e83bf935ec906e42

data/CHANGELOG.md

@@ -6,6 +6,16 @@ Which is based on [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
 
+## [3.1.0] - 2021-03-31
+
+### Changes
+- Use TCPSocket logic with timeout for check-zookeeper-mode.rb and metricz-zookepper.rb  
+- Update development_dependency: yard >= 0.9.20
+- Remove CentOS 6 Asset build, CentOS6 reach end of life
+
+### Fixed
+- Remove deplicate count option in check-zookeeper-cluster.rb
+
 ## [3.0.0] - 2020-03-19
 ### Breaking Changes
 - Bump `sensu-plugin` dependency to `~> 4.0` you can read the changelog entries for [4.0](https://github.com/sensu-plugins/sensu-plugin/blob/master/CHANGELOG.md#400---2018-02-17), [3.0](https://github.com/sensu-plugins/sensu-plugin/blob/master/CHANGELOG.md#300---2018-12-04), and [2.0](https://github.com/sensu-plugins/sensu-plugin/blob/master/CHANGELOG.md#v200---2017-03-29)
@@ -98,7 +108,8 @@ Which is based on [Keep A Changelog](http://keepachangelog.com/)
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-zookeeper/compare/3.0.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-zookeeper/compare/3.1.0...HEAD
+[3.1.0]: https://github.com/sensu-plugins/sensu-plugins-zookeeper/compare/3.0.0...3.1.0
 [3.0.0]: https://github.com/sensu-plugins/sensu-plugins-zookeeper/compare/2.0.0...3.0.0
 [2.0.0]: https://github.com/sensu-plugins/sensu-plugins-zookeeper/compare/1.5.0...2.0.0
 [1.5.0]: https://github.com/sensu-plugins/sensu-plugins-zookeeper/compare/1.4.0...1.5.0

data/bin/check-zookeeper-cluster.rb

@@ -44,13 +44,6 @@ class CheckZookeeperCluster < Sensu::Plugin::Check::CLI
          default: 2181,
          proc: proc(&:to_i)
 
-  option :count,
-         description: 'Zookeeper cluster node count',
-         short: '-c count',
-         long: '--count count',
-         default: 3,
-         proc: proc(&:to_i)
-
   option :exhibitor,
          description: 'exhibitor end node for status checks',
          short: '-e Exhibitor status end point',

data/bin/check-zookeeper-mode.rb

@@ -53,10 +53,16 @@ class CheckZookeeperMode < Sensu::Plugin::Check::CLI
          required: true
 
   def zk_command(four_letter_word)
-    Socket.tcp(config[:server], config[:port]) do |sock|
-      sock.print "#{four_letter_word}\r\n"
-      sock.close_write
-      sock.read
+    TCPSocket.open(config[:server], config[:port]) do |socket|
+      socket.write four_letter_word.to_s
+      ready = IO.select([socket], nil, nil, config[:timeout])
+
+      if ready.nil?
+        critical %(Zookeeper did not respond to #{four_letter_word} within #{config[:timeout]} seconds)
+      end
+
+      result = ready.first.first.read.chomp
+      return result
     end
   end
 

data/bin/metrics-zookeeper.rb

@@ -38,6 +38,13 @@ class ZookeeperMetrics < Sensu::Plugin::Metric::CLI::Graphite
          proc: proc(&:to_i),
          default: 2181
 
+  option :timeout,
+         description: 'How long to wait for a reply in seconds.',
+         short: '-t SECS',
+         long: '--timeout SECS',
+         proc: proc(&:to_i),
+         default: 5
+
   option :scheme,
          description: 'Metric naming scheme, text to prepend to metrics',
          long: '--scheme SCHEME',
@@ -48,10 +55,15 @@ class ZookeeperMetrics < Sensu::Plugin::Metric::CLI::Graphite
   end
 
   def zk_command(four_letter_word)
-    Socket.tcp(config[:host], config[:port]) do |sock|
-      sock.print "#{four_letter_word}\r\n"
-      sock.close_write
-      sock.read
+    TCPSocket.open(config[:server], config[:port]) do |socket|
+      socket.write four_letter_word.to_s
+      ready = IO.select([socket], nil, nil, config[:timeout])
+
+      if ready.nil?
+        critical %(Zookeeper did not respond to '#{four_letter_word}' within #{config[:timeout]} seconds)
+      end
+      result = ready.first.first.read.chomp
+      return result
     end
   end
 

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

@@ -1,7 +1,7 @@
 module SensuPluginsZookeeper
   module Version
     MAJOR = 3
-    MINOR = 0
+    MINOR = 1
     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: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Sensu Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-16 00:00:00.000000000 Z
+date: 2021-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.9.20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.9.20
 description: Zookeeper plugins for checks and metrics
 email: "<sensu-users@googlegroups.com>"
 executables:
@@ -218,8 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for zookeeper