sensu-plugins-elasticsearch 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: e6d0d62bd018ce2c2d38de733a27d8134185ae02
-  data.tar.gz: b4e7691a1720b2e4e8b3c95d1930b1e1515bb417
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MjBkODRkNWI2ZTRhODJmNzlhNzIyY2MxMjBmMjE0ZTNjMGE2YTQxMw==
+  data.tar.gz: !binary |-
+    MzllOTFmNWNiNzJiM2UxNzRhYTE1ZDNmYWQ1MjM5MzMzNGU5YzUxMQ==
 SHA512:
-  metadata.gz: 21f93832491adba01b1ea8d8c7e690c8d30161c7537a9469ac859a7ab5ba99a77de0c73ca56296febb5a2e1ea76242c3d01e2000b2783188e662e49819e4211b
-  data.tar.gz: 22caa5a38c61e5a23007810d668678e43d2f5804bba3b6ed317a639b6ff1b9fd7825a9796c2895af95ea1470b332ce670661df90f66606a66b1490d2318cf598
+  metadata.gz: !binary |-
+    M2IzOWI4Y2NkNzJjNGZiNzIxYjY4ODJiZmFiNDczMzU0MzA3NjJkOGVmMzE0
+    YWIyYTcyYzdlYWRiYWYyN2ExMmIyNzExZjkwMWM3M2U4YWE2YzRkYzJmMDAx
+    OTczYWRhZTM3ZmMyZjMxOThhNDg5ZmM5NWFmYjEwYjQ5NTQ0ZjI=
+  data.tar.gz: !binary |-
+    YzRjMGRkN2JhNzI4ODhmY2I0MmRjZTY4MjMxZDkyNzJlODkxODQyN2E2NGFj
+    NmYyNjBkZThlZmNiZTc5YTcwY2Y2ZmZlYWRmOTFjMzIzYWM3ZjBjODRlNjU3
+    NDllODUxZTg0ZjAzODRiYzIyM2RiZjFkZDAyNmRkNGQ1YWVhM2E=

data/CHANGELOG.md

@@ -3,7 +3,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
-## Unreleased
+## [Unreleased]
+
+## [0.4.3] - 2016-02-22
+### Fixed
+- metrics-es-heap.rb: Assignment of node from the stats variable happened before stats was assigned.  Moved node assignment to be after stats assignment.
 
 ## [0.4.2] - 2016-01-27
 ### Added
@@ -72,7 +76,15 @@ 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/0.1.2...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/0.4.3...HEAD
+[0.4.2]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/0.4.2...0.4.3
+[0.4.2]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/0.4.1...0.4.2
+[0.4.1]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/0.4.0...0.4.1
+[0.4.0]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/0.3.2...0.4.0
+[0.3.2]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/0.3.1...0.3.2
+[0.3.1]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/0.3.0...0.3.1
+[0.3.0]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/0.2.0...0.3.0
+[0.2.0]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/0.1.2...0.2.0
 [0.1.2]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/0.1.1...0.1.2
 [0.1.1]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/0.1.0...0.1.1
 [0.1.0]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/0.0.2...0.1.0

data/README.md

@@ -5,7 +5,6 @@
 [![Code Climate](https://codeclimate.com/github/sensu-plugins/sensu-plugins-elasticsearch/badges/gpa.svg)](https://codeclimate.com/github/sensu-plugins/sensu-plugins-elasticsearch)
 [![Test Coverage](https://codeclimate.com/github/sensu-plugins/sensu-plugins-elasticsearch/badges/coverage.svg)](https://codeclimate.com/github/sensu-plugins/sensu-plugins-elasticsearch)
 [![Dependency Status](https://gemnasium.com/sensu-plugins/sensu-plugins-elasticsearch.svg)](https://gemnasium.com/sensu-plugins/sensu-plugins-elasticsearch)
-[![Codeship Status for sensu-plugins/sensu-plugins-elasticsearch](https://codeship.com/projects/926f1e90-db39-0132-e370-5ad94843e341/status?branch=master)](https://codeship.com/projects/79569)
 
 ## Functionality
 

data/bin/check-es-cluster-status.rb

@@ -111,11 +111,11 @@ class ESClusterStatus < Sensu::Plugin::Check::CLI
   end
 
   def acquire_status
-    if config[:status_timeout]
-      health = get_es_resource("/_cluster/health?wait_for_status=green&timeout=#{config[:status_timeout]}s")
-    else
-      health = get_es_resource('/_cluster/health')
-    end
+    health = if config[:status_timeout]
+               get_es_resource("/_cluster/health?wait_for_status=green&timeout=#{config[:status_timeout]}s")
+             else
+               get_es_resource('/_cluster/health')
+             end
     health['status'].downcase
   end
 

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

@@ -107,11 +107,11 @@ class ESFileDescriptors < Sensu::Plugin::Check::CLI
   end
 
   def acquire_max_fds
-    if Gem::Version.new(acquire_es_version) >= Gem::Version.new('2.0.0')
-      info = get_es_resource('/_nodes/_local/stats?process=true')
-    else
-      info = get_es_resource('/_nodes/_local?process=true')
-    end
+    info = if Gem::Version.new(acquire_es_version) >= Gem::Version.new('2.0.0')
+             get_es_resource('/_nodes/_local/stats?process=true')
+           else
+             get_es_resource('/_nodes/_local?process=true')
+           end
     begin
       keys = info['nodes'].keys
       info['nodes'][keys[0]]['process']['max_file_descriptors'].to_i

data/bin/check-es-heap.rb

@@ -107,13 +107,12 @@ class ESHeap < Sensu::Plugin::Check::CLI
   end
 
   def acquire_heap_data(return_max = false)
-    if Gem::Version.new(acquire_es_version) >= Gem::Version.new('1.0.0')
-      stats = acquire_es_resource('/_nodes/_local/stats?jvm=true')
-      node = stats['nodes'].keys.first
-    else
-      stats = acquire_es_resource('/_cluster/nodes/_local/stats?jvm=true')
-      node = stats['nodes'].keys.first
-    end
+    stats = if Gem::Version.new(acquire_es_version) >= Gem::Version.new('1.0.0')
+              acquire_es_resource('/_nodes/_local/stats?jvm=true')
+            else
+              acquire_es_resource('/_cluster/nodes/_local/stats?jvm=true')
+            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']

data/bin/check-es-node-status.rb

@@ -88,7 +88,7 @@ class ESNodeStatus < Sensu::Plugin::Check::CLI
     node_status = acquire_status
 
     if node_status == 200
-      ok "Alive #{(node_status)}"
+      ok "Alive #{node_status}"
     else
       critical "Dead (#{node_status})"
     end

data/bin/check-es-query-count.rb

@@ -181,7 +181,7 @@ class ESQueryCount < Sensu::Plugin::Check::CLI
         ok "Query count (#{response['count']}) was ok"
       end
     else
-      if response['count'] > config[:crit]
+      if response['count'] > config[:crit] # rubocop:disable Style/IfInsideElse
         critical "Query count (#{response['count']}) was above critical threshold"
       elsif response['count'] > config[:warn]
         warning "Query count (#{response['count']}) was above warning threshold"
@@ -189,17 +189,17 @@ class ESQueryCount < Sensu::Plugin::Check::CLI
         ok "Query count (#{response['count']}) was ok"
       end
     end
-rescue Elasticsearch::Transport::Transport::Errors::NotFound
-  if config[:invert]
-    if response['count'] < config[:crit]
-      critical "Query count (#{response['count']}) was below critical threshold"
-    elsif response['count'] < config[:warn]
-      warning "Query count (#{response['count']}) was below warning threshold"
+  rescue Elasticsearch::Transport::Transport::Errors::NotFound
+    if config[:invert]
+      if response['count'] < config[:crit]
+        critical "Query count (#{response['count']}) was below critical threshold"
+      elsif response['count'] < config[:warn]
+        warning "Query count (#{response['count']}) was below warning threshold"
+      else
+        ok "Query count (#{response['count']}) was ok"
+      end
     else
-      ok "Query count (#{response['count']}) was ok"
+      ok 'No results found, count was below thresholds'
     end
-  else
-    ok 'No results found, count was below thresholds'
-  end
   end
 end

data/bin/check-es-query-exists.rb

@@ -167,7 +167,7 @@ class ESQueryExists < Sensu::Plugin::Check::CLI
     def run # rubocop:disable all
       client.exists(build_request_options)
       ok
-  rescue Elasticsearch::Transport::Transport::Errors::NotFound
-    critical
+    rescue Elasticsearch::Transport::Transport::Errors::NotFound
+      critical
     end
 end

data/bin/metrics-es-cluster.rb

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

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

@@ -163,11 +163,11 @@ class ESNodeGraphiteMetrics < Sensu::Plugin::Metric::CLI::Graphite
       ].join('&')
     end
 
-    if es_version >= Gem::Version.new('1.0.0')
-      stats = get_es_resource("/_nodes/_local/stats?#{stats_query_string}")
-    else
-      stats = get_es_resource("/_cluster/nodes/_local/stats?#{stats_query_string}")
-    end
+    stats = if 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}")
+            end
 
     timestamp = Time.now.to_i
     node = stats['nodes'].values.first
@@ -203,7 +203,7 @@ class ESNodeGraphiteMetrics < Sensu::Plugin::Metric::CLI::Graphite
       metrics['jvm.mem.max_heap_size_in_bytes']   = 0
 
       node['jvm']['mem']['pools'].each do |k, v|
-        metrics["jvm.mem.#{k.gsub(' ', '_')}.max_in_bytes"] = v['max_in_bytes']
+        metrics["jvm.mem.#{k.tr(' ', '_')}.max_in_bytes"] = v['max_in_bytes']
         metrics['jvm.mem.max_heap_size_in_bytes'] += v['max_in_bytes']
       end
 

data/bin/metrics-es-node.rb

@@ -100,11 +100,11 @@ class ESMetrics < Sensu::Plugin::Metric::CLI::Graphite
     node = stats['nodes'].values.first
     node['jvm']['mem']['heap_max_in_bytes'] = ln['nodes'].values.first['jvm']['mem']['heap_max_in_bytes']
     metrics = {}
-    if es_version >= Gem::Version.new('2.0.0')
-      metrics['os.load_average'] = node['os']['load_average']
-    else
-      metrics['os.load_average'] = node['os']['load_average'][0]
-    end
+    metrics['os.load_average'] = if es_version >= Gem::Version.new('2.0.0')
+                                   node['os']['load_average']
+                                 else
+                                   node['os']['load_average'][0]
+                                 end
     metrics['os.mem.free_in_bytes'] = node['os']['mem']['free_in_bytes']
     metrics['process.mem.resident_in_bytes'] = node['process']['mem']['resident_in_bytes']
     metrics['jvm.mem.heap_used_in_bytes'] = node['jvm']['mem']['heap_used_in_bytes']

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

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

metadata

@@ -1,36 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Sensu Plugins and contributors
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDgDCCAmigAwIBAgIBATANBgkqhkiG9w0BAQUFADBDMRIwEAYDVQQDDAltYXR0
-  am9uZXMxGDAWBgoJkiaJk/IsZAEZFgh5aWVsZGJvdDETMBEGCgmSJomT8ixkARkW
-  A2NvbTAeFw0xNTAxMjgyMTAyNTFaFw0xNjAxMjgyMTAyNTFaMEMxEjAQBgNVBAMM
-  CW1hdHRqb25lczEYMBYGCgmSJomT8ixkARkWCHlpZWxkYm90MRMwEQYKCZImiZPy
-  LGQBGRYDY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyTSzVYnO
-  CLgyrIyT1mBQakArQyW8xhi6MlDqyzXHJGeERT790U6EgoBVeS4XoK0ptFZNR8Tf
-  zko0w+Nv47TarSCgkPOaxY+mxWnAVR10dOmfeLr7huiMyps+YD56/EF2FqQ3jf/+
-  qohENfKD91qy1ieEy+Fn7Pf74ltbNKUdkb9a9eFXQ0DQ4ip5vik7DzjQkUTj4lca
-  k6ArwnmHX4YDhZoYtrQJ8jVktN0/+NtA40M5qkCYHNe5tUW25b/tKVYuioxG6b2Z
-  oIzaZxRLxf6HVAWpCVRT/F5+/yjigkX4u++eYacfLGleXQzoK7BL65vHGMJygWEE
-  0TKGqFOrl/L0AQIDAQABo38wfTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNV
-  HQ4EFgQUEf6a8Td7MrSZc8ImbLFZAENPbz0wIQYDVR0RBBowGIEWbWF0dGpvbmVz
-  QHlpZWxkYm90LmNvbTAhBgNVHRIEGjAYgRZtYXR0am9uZXNAeWllbGRib3QuY29t
-  MA0GCSqGSIb3DQEBBQUAA4IBAQBbzXAYA3BVGw8DZ0YYoY1VHPNEcH5qPIApmHO8
-  rvSmuUT0yMEi7u00H/5uHRFf4LleGT/+sTdyXKsNPGT9kdRuQEgwi+vf7Zfvd8aX
-  UF/+4VkEYf/8rV8Ere6u2QaWPgApdMV6JjKr1fAwCTd8AuGXNaWItiPPMseSQzLJ
-  JKP4hVvbc1d+oS925B1lcBiqn2aYvElbyNAVmQPywNNqkWmvtlqj9ZVJfV5HQLdu
-  8sHuVruarogxxKPBzlL2is4EUb6oN/RdpGx2l4254+nyR+abg//Ed27Ym0PkB4lk
-  HP0m8WSjZmFr109pE/sVsM5jtOCvogyujQOjNVGN4gz1wwPr
-  -----END CERTIFICATE-----
-date: 2016-01-28 00:00:00.000000000 Z
+cert_chain: []
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -64,158 +42,157 @@ dependencies:
   name: sensu-plugin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
   name: github-markup
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: '0.37'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: '0.37'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
-description: |-
-  This plugin provides native ElasticSearch instrumentation
-                                for monitoring and metrics collection, including:
-                                service health and metrics for cluster, node, and more.
-email: "<sensu-users@googlegroups.com>"
+description: ! "This plugin provides native ElasticSearch instrumentation\n                              for
+  monitoring and metrics collection, including:\n                              service
+  health and metrics for cluster, node, and more."
+email: <sensu-users@googlegroups.com>
 executables:
-- metrics-es-node.rb
-- metrics-es-node-graphite.rb
-- metrics-es-cluster.rb
-- check-es-query-exists.rb
-- check-es-query-count.rb
-- check-es-node-status.rb
-- check-es-heap.rb
-- check-es-file-descriptors.rb
-- check-es-cluster-status.rb
 - check-es-circuit-breakers.rb
+- check-es-cluster-status.rb
+- check-es-file-descriptors.rb
+- check-es-heap.rb
+- check-es-node-status.rb
+- check-es-query-count.rb
+- check-es-query-exists.rb
+- metrics-es-cluster.rb
+- metrics-es-node-graphite.rb
+- metrics-es-node.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -252,17 +229,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for elasticsearch