sensu-plugins-elasticsearch 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f7600762037d73659509576437eef0a316a9d5a
-  data.tar.gz: e0cc27195701ab4049c8f6ea15bcb968c390ad92
+  metadata.gz: 90fbda760f74eae51619a41d8da2201f3f62caa9
+  data.tar.gz: 647f75c70da606f865758926e1f25b2572b06f61
 SHA512:
-  metadata.gz: d2801947e4560f554fbddb7bbe44e1bcd9a3c20b83648e10311be52fc7f27eefe3ab54118a5c90fb822e39486c381b3c32f3840f52f603491700597dcbe16830
-  data.tar.gz: d81addcbe586df2a477c0096121da1fb5596261b622ab1078877dc4635fe05b7027b3cd896ec6922a792b12bd7a85d5324c72719fe2c302c15ae313562404725
+  metadata.gz: d7629bfa0302befb14df1c43c363f01f41be65c4981168c01e978754b173f5038ae5457b84768ce76fac9ab7ce0b128634ef94e5f1a433811e859d2bde456d67
+  data.tar.gz: db8e5a2d01275a48dbb84d6bd6cd592a7a5ffc6d7cf8ef202fb01fadb6286e2de99cdfdedf985e9f6eebc307b081f9e8a516b891b51f45d1834752fa55fc7d8b

data/CHANGELOG.md

@@ -5,6 +5,11 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## [Unreleased]
 
+## [1.1.2] - 2016-12-29
+### Fixed
+- Fixed metrics-es-node-graphite.rb was not compatible with Elasticsearch 5.0 (@woqer)
+- Make query lib compatible with ES 5+ (@jackfengji)
+
 ## [1.1.1] - 2016-11-26
 ### Fixed
 - Fixed check-es-file-descriptors.rb was not compatible with Elasticsearch 5.0 (@woqer)
@@ -126,7 +131,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.1...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/1.1.2...HEAD
+[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
 [1.0.0]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/0.5.3...1.0.0

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

@@ -151,7 +151,15 @@ class ESNodeGraphiteMetrics < Sensu::Plugin::Metric::CLI::Graphite
 
     es_version = Gem::Version.new(acquire_es_version)
 
-    if es_version >= Gem::Version.new('1.0.0')
+    if es_version >= Gem::Version.new('3.0.0')
+      stats_query_array = %w(indices http network transport thread_pool)
+      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('fs') if fs_stats == true
+      stats_query_string = stats_query_array.join(',')
+    elsif es_version >= Gem::Version.new('1.0.0')
       stats_query_array = %w(indices http network transport thread_pool)
       stats_query_array.push('jvm') if jvm_stats == true
       stats_query_array.push('os') if os_stat == true
@@ -175,7 +183,9 @@ class ESNodeGraphiteMetrics < Sensu::Plugin::Metric::CLI::Graphite
       ].join('&')
     end
 
-    stats = if es_version >= Gem::Version.new('1.0.0')
+    stats = if es_version >= Gem::Version.new('3.0.0')
+              get_es_resource("/_nodes/_local/stats/#{stats_query_string}")
+            elsif es_version >= Gem::Version.new('1.0.0')
               get_es_resource("/_nodes/_local/stats?#{stats_query_string}")
             else
               get_es_resource("/_cluster/nodes/_local/stats?#{stats_query_string}")

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

@@ -83,21 +83,20 @@ module ElasticsearchQuery
       unless es_date_start.nil?
         options[:body] = {
           'query' => {
-            'filtered' => {
-              'query' => {
+            'bool' => {
+              'must' => [{
                 'query_string' => {
                   'default_field' => config[:search_field],
                   'query' => config[:query]
                 }
-              },
-              'filter' => {
+              }, {
                 'range' => {
                   config[:timestamp_field] => {
                     'gt' => es_date_start,
                     'lt' => end_time.strftime('%Y-%m-%dT%H:%M:%S')
                   }
                 }
-              }
+              }]
             }
           }
         }

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

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