sensu-plugins-elasticsearch 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90fbda760f74eae51619a41d8da2201f3f62caa9
-  data.tar.gz: 647f75c70da606f865758926e1f25b2572b06f61
+  metadata.gz: 4cf660c00d0f12fd0495a16b3bae4720b6116ff1
+  data.tar.gz: 8ada34c80777d6f0ec07b17a22de21f9d34721f1
 SHA512:
-  metadata.gz: d7629bfa0302befb14df1c43c363f01f41be65c4981168c01e978754b173f5038ae5457b84768ce76fac9ab7ce0b128634ef94e5f1a433811e859d2bde456d67
-  data.tar.gz: db8e5a2d01275a48dbb84d6bd6cd592a7a5ffc6d7cf8ef202fb01fadb6286e2de99cdfdedf985e9f6eebc307b081f9e8a516b891b51f45d1834752fa55fc7d8b
+  metadata.gz: 57480b7dc012d422bbf3bd6a306e257a9139cded4c7ab93465244c3e5ff53cae8cdd034f6e03100c9257d35467a7b01b199522f02765e1987b2c28debe34f0a5
+  data.tar.gz: 8ee4b65d749dc139685b940487ec05cfab072e211c7d0d6e03db220f3cb9b30d74ffa23f86da2772070d43e2be440f596ef6446a07c75b3b3ab5da653b2bbac2

data/CHANGELOG.md

@@ -5,6 +5,10 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## [Unreleased]
 
+## [1.1.3] - 2017-01-04
+### Fixed
+- metrics-es-cluster/metrics-es-node-graphite.rb: Fix Elasticsearch 5.0 compatability (@terjesannum)
+
 ## [1.1.2] - 2016-12-29
 ### Fixed
 - Fixed metrics-es-node-graphite.rb was not compatible with Elasticsearch 5.0 (@woqer)
@@ -131,7 +135,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.2...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/1.1.3...HEAD
+[1.1.3]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/1.1.2...1.1.3
 [1.1.2]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/1.1.1...1.1.2
 [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

data/bin/metrics-es-cluster.rb

@@ -117,7 +117,11 @@ class ESClusterMetrics < Sensu::Plugin::Metric::CLI::Graphite
   end
 
   def master?
-    state = get_es_resource('/_cluster/state?filter_routing_table=true&filter_metadata=true&filter_indices=true')
+    state = if Gem::Version.new(acquire_es_version) >= Gem::Version.new('3.0.0')
+              get_es_resource('/_cluster/state/master_node')
+            else
+              get_es_resource('/_cluster/state?filter_routing_table=true&filter_metadata=true&filter_indices=true')
+            end
     local = if Gem::Version.new(acquire_es_version) >= Gem::Version.new('1.0.0')
               get_es_resource('/_nodes/_local')
             else

data/bin/metrics-es-node-graphite.rb

@@ -152,11 +152,11 @@ class ESNodeGraphiteMetrics < Sensu::Plugin::Metric::CLI::Graphite
     es_version = Gem::Version.new(acquire_es_version)
 
     if es_version >= Gem::Version.new('3.0.0')
-      stats_query_array = %w(indices http network transport thread_pool)
+      stats_query_array = %w(indices http transport)
       stats_query_array.push('jvm') if jvm_stats == true
       stats_query_array.push('os') if os_stat == true
       stats_query_array.push('process') if process_stats == true
-      stats_query_array.push('tp_stats') if tp_stats == true
+      stats_query_array.push('thread_pool') if tp_stats == true
       stats_query_array.push('fs') if fs_stats == true
       stats_query_string = stats_query_array.join(',')
     elsif es_version >= Gem::Version.new('1.0.0')

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

@@ -2,7 +2,7 @@ module SensuPluginsElasticsearch
   module Version
     MAJOR = 1
     MINOR = 1
-    PATCH = 2
+    PATCH = 3
 
     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.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Sensu Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-30 00:00:00.000000000 Z
+date: 2017-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client