sensu-plugins-elasticsearch 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cf660c00d0f12fd0495a16b3bae4720b6116ff1
-  data.tar.gz: 8ada34c80777d6f0ec07b17a22de21f9d34721f1
+  metadata.gz: 07a6752410931a8f63c7de143df9c84cae249b41
+  data.tar.gz: c2d1771cde187e3b7f5b4d225428238d18f7966d
 SHA512:
-  metadata.gz: 57480b7dc012d422bbf3bd6a306e257a9139cded4c7ab93465244c3e5ff53cae8cdd034f6e03100c9257d35467a7b01b199522f02765e1987b2c28debe34f0a5
-  data.tar.gz: 8ee4b65d749dc139685b940487ec05cfab072e211c7d0d6e03db220f3cb9b30d74ffa23f86da2772070d43e2be440f596ef6446a07c75b3b3ab5da653b2bbac2
+  metadata.gz: d39482790fdcc0ded89b8f05b5c04ea20cdad77d35926806c3b2adeae691c835f64d2c3a5ae36b49656857038ac7352d5363ac3d45af8f80ce91d96ffcbc7d77
+  data.tar.gz: 8bce7fd56da1cbf025560a7f4b5a64f7e874166635631304242bbcb52346550e585443c2b581bb82e1feeef934f1c3a470af8c38a68e875da43e2a683c8d272f

data/CHANGELOG.md

@@ -4,6 +4,12 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
+## [1.2.0] - 2017-05-03
+### Fixed
+- metrics-es-cluster.rb: Check to see if cluster key exists in transient_settings before trying to use it. (@RAR)
+### Added
+- Add option to run check-es-shard-allocation-status.rb on non master nodes (@Evesy)
+- Fixed check-es-shard-allocation-status.rb for Elasticsearch 5.x compatibility (@Evesy)
 
 ## [1.1.3] - 2017-01-04
 ### Fixed
@@ -135,7 +141,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.3...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/1.2.0...HEAD
+[1.2.0]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/1.1.3...1.2.0
 [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

data/bin/check-es-shard-allocation-status.rb

@@ -52,8 +52,14 @@ class ESShardAllocationStatus < Sensu::Plugin::Check::CLI
          long: '--port PORT',
          default: '9200'
 
+  option :allow_non_master,
+         description: 'Allow check to run on non-master nodes',
+         short: '-a',
+         long: '--allow-non-master',
+         default: false
+
   def get_es_resource(resource)
-    r = RestClient::Resource.new("#{config[:scheme]}://#{config[:server]}:#{config[:port]}/#{resource}", timeout: 45)
+    r = RestClient::Resource.new("#{config[:scheme]}://#{config[:server]}:#{config[:port]}#{resource}", timeout: 45)
     JSON.parse(r.get)
   rescue Errno::ECONNREFUSED
     warning 'Connection refused'
@@ -62,7 +68,7 @@ class ESShardAllocationStatus < Sensu::Plugin::Check::CLI
   end
 
   def master?
-    state = get_es_resource('/_cluster/state?filter_routing_table=true&filter_metadata=true&filter_indices=true&filter_blocks=true&filter_nodes=true')
+    state = get_es_resource('/_cluster/state/master_node')
     local = get_es_resource('/_nodes/_local')
     local['nodes'].keys.first == state['master_node']
   end
@@ -79,7 +85,7 @@ class ESShardAllocationStatus < Sensu::Plugin::Check::CLI
   end
 
   def run
-    if master?
+    if config[:allow_non_master] || master?
       transient   = get_status('transient')
       persistent  = get_status('persistent')
 

data/bin/metrics-es-cluster.rb

@@ -177,10 +177,10 @@ class ESClusterMetrics < Sensu::Plugin::Metric::CLI::Graphite
   def acquire_allocation_status
     cluster_config = get_es_resource('/_cluster/settings')
     transient_settings = cluster_config['transient']
-    if transient_settings.empty?
-      return nil
-    else
+    if transient_settings.key?('cluster')
       return %w(none new_primaries primaries all).index(transient_settings['cluster']['routing']['allocation']['enable'])
+    else
+      return nil
     end
   end
 

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

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