sensu-plugins-elasticsearch 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df9596b9f751d85dd0f774ad4d356b41dfa3cb16
-  data.tar.gz: 80c0c997e2b2cf195e3062794e5c19c1d8175c4b
+  metadata.gz: 7274d48632cbac489016fcc28073665e0221bd81
+  data.tar.gz: 3786345e742f828052e54fe80c1d2eb81c9b0cbe
 SHA512:
-  metadata.gz: 042ccabd49cc993b4d114bd8e287b3a534f493c83067fe7f6274517a42f867ae248fb82480741c5455388e6ace45f626c0726b5a7e89e3148935ecf69a773f4f
-  data.tar.gz: db0f1701b0f3a1008b5a9d1cc319967351c5e86906d6683a8a7a964d9fef8362e8e36a3dfb81054c6895532ec6944e7550823953269b7a53a9a791de6e8931cf
+  metadata.gz: 660cbc6632fdc418a7dbc48525cd0b517ad7d7556ea5e8f4c87dc490993944c126ba1b74d82a99264eed7516b868726b56cf22b578be917b7e367806928a58eb
+  data.tar.gz: 5995bf40185ee2bb37007f918c88dd8d8cbdef86062bbf38f4d7f53ee018f20a1b026a9d6ee62d9388264251753c260139fddc1def8c6bf3c50e6cd84d5d70e5

data/CHANGELOG.md

@@ -5,6 +5,11 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## Unreleased
 
+## [0.3.1] - 2015-12-29
+### Changed
+- Update metrics-es-node.rb to use version checks consistent with other metrics
+- Update metrics-es-cluster.rb to use `_stats` api instead of `/_count?q=*:*` see [Unbound wildcard range query cripples es on larger installs #20](https://github.com/sensu-plugins/sensu-plugins-elasticsearch/issues/20)
+
 ## [0.3.0] - 2015-11-18
 ### Changed
 - Update metrics-es-node-graphite.rb, check-es-node-status.rb, and check-es-file-descriptors.rb for Elasticsearch 2.0

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

@@ -34,8 +34,7 @@
 require 'sensu-plugin/check/cli'
 require 'elasticsearch'
 require 'time'
-
-require_relative 'sensu-plugins-elasticsearch'
+require 'sensu-plugins-elasticsearch'
 
 #
 # ES Heap
@@ -103,6 +102,13 @@ class ESQueryCount < Sensu::Plugin::Check::CLI
          boolean: true,
          default: false
 
+  option :search_field,
+         description: 'The Elasticsearch document field to search for your query string.',
+         short: '-f FIELD',
+         long: '--field FIELD',
+         required: false,
+         default: 'message'
+
   option :query,
          description: 'Elasticsearch query',
          short: '-q QUERY',
@@ -168,29 +174,29 @@ class ESQueryCount < Sensu::Plugin::Check::CLI
     response = client.count(build_request_options)
     if config[:invert]
       if response['count'] < config[:crit]
-        critical 'Query count was below critical threshold'
+        critical "Query count (#{response['count']}) was below critical threshold"
       elsif response['count'] < config[:warn]
-        warning 'Query count was below warning threshold'
+        warning "Query count (#{response['count']}) was below warning threshold"
       else
-        ok
+        ok "Query count (#{response['count']}) was ok"
       end
     else
       if response['count'] > config[:crit]
-        critical 'Query count was above critical threshold'
+        critical "Query count (#{response['count']}) was above critical threshold"
       elsif response['count'] > config[:warn]
-        warning 'Query count was above warning threshold'
+        warning "Query count (#{response['count']}) was above warning threshold"
       else
-        ok
+        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 was below critical threshold'
+      critical "Query count (#{response['count']}) was below critical threshold"
     elsif response['count'] < config[:warn]
-      warning 'Query count was below warning threshold'
+      warning "Query count (#{response['count']}) was below warning threshold"
     else
-      ok
+      ok "Query count (#{response['count']}) was ok"
     end
   else
     ok 'No results found, count was below thresholds'

data/bin/metrics-es-cluster.rb

@@ -109,8 +109,8 @@ class ESClusterMetrics < Sensu::Plugin::Metric::CLI::Graphite
   end
 
   def acquire_document_count
-    document_count = get_es_resource('/_count?q=*:*')
-    document_count['count']
+    document_count = get_es_resource('/_stats/docs')
+    document_count['_all']['total']['docs']['count']
   end
 
   def run

data/bin/metrics-es-node.rb

@@ -66,16 +66,34 @@ class ESMetrics < Sensu::Plugin::Metric::CLI::Graphite
          short: '-P PASS',
          long: '--password PASS'
 
-  def run
+  def acquire_es_version
+    info = get_es_resource('/')
+    info['version']['number']
+  end
+
+  def get_es_resource(resource)
     headers = {}
     if config[:user] && config[:password]
       auth = 'Basic ' + Base64.encode64("#{config[:user]}:#{config[:password]}").chomp
       headers = { 'Authorization' => auth }
     end
-    ln = RestClient::Resource.new "http://#{config[:host]}:#{config[:port]}/_cluster/nodes/_local", timeout: 30, headers: headers
-    stats = RestClient::Resource.new "http://#{config[:host]}:#{config[:port]}/_cluster/nodes/_local/stats", timeout: 30, headers: headers
-    ln = JSON.parse(ln.get)
-    stats = JSON.parse(stats.get)
+    r = RestClient::Resource.new("http://#{config[:host]}:#{config[:port]}#{resource}", timeout: config[:timeout], headers: headers)
+    JSON.parse(r.get)
+  rescue Errno::ECONNREFUSED
+    warning 'Connection refused'
+  rescue RestClient::RequestTimeout
+    warning 'Connection timed out'
+  end
+
+  def run
+    if Gem::Version.new(acquire_es_version) >= Gem::Version.new('1.0.0')
+      ln = get_es_resource('/_nodes/_local')
+      stats = get_es_resource('/_nodes/_local/stats')
+    else
+      ln = get_es_resource('/_cluster/nodes/_local')
+      stats = get_es_resource('/_cluster/nodes/_local/stats')
+    end
+
     timestamp = Time.now.to_i
     node = stats['nodes'].values.first
     node['jvm']['mem']['heap_max_in_bytes'] = ln['nodes'].values.first['jvm']['mem']['heap_max_in_bytes']

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

@@ -74,7 +74,7 @@ module ElasticsearchQuery
             'filtered' => {
               'query' => {
                 'query_string' => {
-                  'default_field' => 'message',
+                  'default_field' => config[:search_field],
                   'query' => config[:query]
                 }
               },
@@ -97,6 +97,7 @@ module ElasticsearchQuery
   def es_date_math_string
     if config[:minutes_previous] == 0 && \
        config[:hours_previous] == 0 && \
+       config[:days_previous] == 0 && \
        config[:weeks_previous] == 0 && \
        config[:months_previous] == 0
       return nil

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Sensu Plugins and contributors
@@ -30,7 +30,7 @@ cert_chain:
   8sHuVruarogxxKPBzlL2is4EUb6oN/RdpGx2l4254+nyR+abg//Ed27Ym0PkB4lk
   HP0m8WSjZmFr109pE/sVsM5jtOCvogyujQOjNVGN4gz1wwPr
   -----END CERTIFICATE-----
-date: 2015-11-19 00:00:00.000000000 Z
+date: 2015-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -203,7 +203,7 @@ dependencies:
 description: |-
   This plugin provides native ElasticSearch instrumentation
                                 for monitoring and metrics collection, including:
-                                service health and metrics for cluster, node, and more
+                                service health and metrics for cluster, node, and more.
 email: "<sensu-users@googlegroups.com>"
 executables:
 - metrics-es-node.rb