sensu-plugins-elasticsearch 1.7.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9b5d19c687717bb77c715fe191176912e2b4eeb0
-  data.tar.gz: ba45b265535b3a4829e2ffbde77994a9f0c8367a
+SHA256:
+  metadata.gz: 5014ee2207634368bdbc7c2c04c7bd172ead09d0e613ef241aec1c323508653d
+  data.tar.gz: b2614e8f3bd7c5098895b23a25e0b7ae10b9319292254d5ddc082f625801b29f
 SHA512:
-  metadata.gz: 9ccf40f6c0612d23fe4f46215497f68c61109243dca77ca4da7f47808242f7371b20083f5c239d94a662e3f6fd3eb1467e26d1cee8975abb9bb1570bd7aaa374
-  data.tar.gz: 659d435cabed3488b826d6f1a4b8947e86bbe43655b3f6fd761f0414be487e75242cdd8fffb0c70be764cb22aea617d98c3b75eb116a7711945fac08e9981e82
+  metadata.gz: b20456f73eedcf8ba79932343128513cdecaf06ffff3353d86b63a6131d8700f04005e0574ec279ea7de1f28a4e7412829ea153b0ddc99e67dafcf6f367b8852
+  data.tar.gz: eed566f1a9b0034b84cb06c167b9044a42bd38641b11d6be0e301518bdb2ef727ee35284344afa9a9d2d9b5a4fb1d54dad2036ae9a3ec6a80c33da0bff047c79

data/CHANGELOG.md

@@ -1,10 +1,15 @@
 # Change Log
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
+This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins/community/blob/master/HOW_WE_CHANGELOG.md)
 
 ## [Unreleased]
 
+## [1.8.0] - 2017-11-21
+### Added
+- bin/check-es-heap.rb: added support to check heap usage of all nodes in a cluster (@cihangirbesiktas)
+- update changelog location guidelines (@majormoses)
+
 ## [1.7.1] - 2017-09-18
 ### Fixed
 - bin/check-es-cluster-health.rb and bin/check-es-cluster-status.rb fixed --alert-status failing to alert and allow absent value to alert on any status (@rwky)
@@ -200,7 +205,8 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 - initial release
 
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/1.7.1...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/1.8.0...HEAD
+[1.8.0]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/1.7.1...1.8.0
 [1.7.1]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/1.7.0...1.7.1
 [1.7.0]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/1.6.1...1.7.0
 [1.6.1]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/1.6.0...1.6.1

data/bin/check-es-heap.rb

@@ -90,6 +90,12 @@ class ESHeap < Sensu::Plugin::Check::CLI
          short: '-e',
          long: '--https'
 
+  option :all,
+         description: 'Check all nodes in the ES cluster',
+         short: '-a',
+         long: '--all',
+         default: false
+
   def acquire_es_version
     info = acquire_es_resource('/')
     info['version']['number']
@@ -120,46 +126,67 @@ class ESHeap < Sensu::Plugin::Check::CLI
     warning 'Elasticsearch API returned invalid JSON'
   end
 
-  def acquire_heap_data(return_max = false)
-    stats = if Gem::Version.new(acquire_es_version) >= Gem::Version.new('1.0.0')
-              acquire_es_resource('/_nodes/_local/stats')
-            else
-              acquire_es_resource('/_cluster/nodes/_local/stats')
-            end
-    node = stats['nodes'].keys.first
-    begin
-      if return_max
-        return stats['nodes'][node]['jvm']['mem']['heap_used_in_bytes'], stats['nodes'][node]['jvm']['mem']['heap_max_in_bytes']
+  def acquire_stats
+    if Gem::Version.new(acquire_es_version) >= Gem::Version.new('1.0.0')
+      if config[:all]
+        acquire_es_resource('/_nodes/stats')
       else
-        stats['nodes'][node]['jvm']['mem']['heap_used_in_bytes']
+        acquire_es_resource('/_nodes/_local/stats')
       end
-    rescue
-      warning 'Failed to obtain heap used in bytes'
+    elsif config[:all]
+      acquire_es_resource('/_cluster/nodes/stats')
+    else
+      acquire_es_resource('/_cluster/nodes/_local/stats')
     end
   end
 
-  def run
+  def acquire_heap_data(node)
+    return node['jvm']['mem']['heap_used_in_bytes'], node['jvm']['mem']['heap_max_in_bytes']
+  rescue
+    warning 'Failed to obtain heap used in bytes'
+  end
+
+  def acquire_heap_usage(heap_used, heap_max, node_name)
     if config[:percentage]
-      heap_used, heap_max = acquire_heap_data(true)
-      heap_used_ratio = ((100 * heap_used) / heap_max).to_i
-      message "Heap used in bytes #{heap_used} (#{heap_used_ratio}% full)"
-      if heap_used_ratio >= config[:crit]
-        critical
-      elsif heap_used_ratio >= config[:warn]
-        warning
-      else
-        ok
-      end
+      heap_usage = ((100 * heap_used) / heap_max).to_i
+      output = if config[:all]
+                 "Node #{node_name}: Heap used in bytes #{heap_used} (#{heap_usage}% full)\n"
+               else
+                 "Heap used in bytes #{heap_used} (#{heap_usage}% full)"
+               end
     else
-      heap_used = acquire_heap_data(false)
-      message "Heap used in bytes #{heap_used}"
-      if heap_used >= config[:crit]
-        critical
-      elsif heap_used >= config[:warn]
-        warning
-      else
-        ok
+      heap_usage = heap_used
+      output = config[:all] ? "Node #{node_name}: Heap used in bytes #{heap_used}\n" : "Heap used in bytes #{heap_used}"
+    end
+    [heap_usage, output]
+  end
+
+  def run
+    stats = acquire_stats
+    status = { crit: '', warn: '', ok: '' }
+
+    # Check all the nodes in the cluster, alert if any of the nodes have heap usage above thresholds
+    stats['nodes'].each do |_, node|
+      heap_used, heap_max = acquire_heap_data(node)
+      heap_usage, output = acquire_heap_usage(heap_used, heap_max, node['name'])
+      if heap_usage >= config[:crit]
+        status[:crit] += output
+      elsif heap_usage >= config[:warn]
+        status[:warn] += output
+      elsif !config[:all]
+        status[:ok] += output
       end
     end
+
+    if !status[:crit].empty?
+      message status[:crit]
+      critical
+    elsif !status[:warn].empty?
+      message status[:warn]
+      warning
+    else
+      message status[:ok]
+      ok
+    end
   end
 end

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

@@ -1,8 +1,8 @@
 module SensuPluginsElasticsearch
   module Version
     MAJOR = 1
-    MINOR = 7
-    PATCH = 1
+    MINOR = 8
+    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.7.1
+  version: 1.8.0
 platform: ruby
 authors:
 - Sensu Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-18 00:00:00.000000000 Z
+date: 2017-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -294,7 +294,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.2
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for elasticsearch