sensu-plugins-elasticsearch 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ed5007f08f3c8b041dbdefc02e3048eedea4344
-  data.tar.gz: bae5313f706c29f0ac15b9c6f1d14ca5f62ec548
+  metadata.gz: 3f7600762037d73659509576437eef0a316a9d5a
+  data.tar.gz: e0cc27195701ab4049c8f6ea15bcb968c390ad92
 SHA512:
-  metadata.gz: 4c98a9beafb8521e83dbfe30a1d2899f06408637f87e5541f3e21c517cde5de050c9edbb2e2e153f2a31f35b3c667457e197ff9e3867de29ba8140f24a14a349
-  data.tar.gz: 063d44a9119a86445aa315e2d192c62e0ade50722482be8b7a15103b845a83d5f7eef000fb055a79b4fa54ed4b0f5cf5798e40347019e4184b9a6205bca1f461
+  metadata.gz: d2801947e4560f554fbddb7bbe44e1bcd9a3c20b83648e10311be52fc7f27eefe3ab54118a5c90fb822e39486c381b3c32f3840f52f603491700597dcbe16830
+  data.tar.gz: d81addcbe586df2a477c0096121da1fb5596261b622ab1078877dc4635fe05b7027b3cd896ec6922a792b12bd7a85d5324c72719fe2c302c15ae313562404725

data/CHANGELOG.md

@@ -5,6 +5,10 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## [Unreleased]
 
+## [1.1.1] - 2016-11-26
+### Fixed
+- Fixed check-es-file-descriptors.rb was not compatible with Elasticsearch 5.0 (@woqer)
+
 ## [1.1.0] - 2016-11-14
 ### Changed
 - Changed check-es-heap.rb to be compatible with Elasticsearch 5.0 (@christianherro)
@@ -122,7 +126,8 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/1.1.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/1.1.1...HEAD
+[1.1.1]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/1.1.0...1.1.1
 [1.1.0]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/1.0.0...1.1.0
 [1.0.0]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/0.5.3...1.0.0
 [0.5.3]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/0.4.3...0.5.3

data/bin/check-es-file-descriptors.rb

@@ -110,8 +110,16 @@ class ESFileDescriptors < Sensu::Plugin::Check::CLI
     info['version']['number']
   end
 
+  def es_version
+    @es_version ||= Gem::Version.new(acquire_es_version)
+  end
+
   def acquire_open_fds
-    stats = get_es_resource('/_nodes/_local/stats?process=true')
+    stats = if es_version < Gem::Version.new('5.0.0')
+              get_es_resource('/_nodes/_local/stats?process=true')
+            else
+              get_es_resource('/_nodes/_local/stats/process')
+            end
     begin
       keys = stats['nodes'].keys
       stats['nodes'][keys[0]]['process']['open_file_descriptors'].to_i
@@ -121,10 +129,12 @@ class ESFileDescriptors < Sensu::Plugin::Check::CLI
   end
 
   def acquire_max_fds
-    info = if Gem::Version.new(acquire_es_version) >= Gem::Version.new('2.0.0')
+    info = if es_version < Gem::Version.new('2.0.0')
+             get_es_resource('/_nodes/_local?process=true')
+           elsif es_version < Gem::Version.new('5.0.0')
              get_es_resource('/_nodes/_local/stats?process=true')
            else
-             get_es_resource('/_nodes/_local?process=true')
+             get_es_resource('/_nodes/_local/stats/process')
            end
     begin
       keys = info['nodes'].keys

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Sensu Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-14 00:00:00.000000000 Z
+date: 2016-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client