sensu-plugins-elasticsearch 0.4.3 → 0.5.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjBkODRkNWI2ZTRhODJmNzlhNzIyY2MxMjBmMjE0ZTNjMGE2YTQxMw==
+    YjkwYTFiOWMzYjAzMzY0OTNiZjE5ZDZkNWY3NTliNzJiMGU2NWQ4ZQ==
   data.tar.gz: !binary |-
-    MzllOTFmNWNiNzJiM2UxNzRhYTE1ZDNmYWQ1MjM5MzMzNGU5YzUxMQ==
+    OWI1ZTYzMjU5NTM1MzljZDA5NTlkOTViYThiNzBlZDY0ODQ2NTA1Yg==
 SHA512:
   metadata.gz: !binary |-
-    M2IzOWI4Y2NkNzJjNGZiNzIxYjY4ODJiZmFiNDczMzU0MzA3NjJkOGVmMzE0
-    YWIyYTcyYzdlYWRiYWYyN2ExMmIyNzExZjkwMWM3M2U4YWE2YzRkYzJmMDAx
-    OTczYWRhZTM3ZmMyZjMxOThhNDg5ZmM5NWFmYjEwYjQ5NTQ0ZjI=
+    MGNhNjRjZWEzZjQ2OTBlYjI5OTJjY2Y5YmFmOTc5ZTE2YjFhODNjYjc2OWMy
+    YmQ0OWMyZWRlMWJjYTMwODU2MzQxNjc3ZjFmYTI2ZTliODI1ODQxMmFmOGQz
+    ZDNkNjFkNTU5OTFhYjdiNWEzYjQ2NzAyMDc2MTIwNzAxNmMwODQ=
   data.tar.gz: !binary |-
-    YzRjMGRkN2JhNzI4ODhmY2I0MmRjZTY4MjMxZDkyNzJlODkxODQyN2E2NGFj
-    NmYyNjBkZThlZmNiZTc5YTcwY2Y2ZmZlYWRmOTFjMzIzYWM3ZjBjODRlNjU3
-    NDllODUxZTg0ZjAzODRiYzIyM2RiZjFkZDAyNmRkNGQ1YWVhM2E=
+    MzYyODViMzE4OTExZGU1Y2RjMWJkY2UzNTVjMGZiY2Q1Y2QzNGJjZGY2NGQ0
+    YTRkOWEzNTA0MThkYzE5ZDI1NjNhOWM1YjAyMGQwNzk5MjQ3ZDAzMzY0N2I1
+    YTUzNDJhYTRmMTJlMDFiNzIzMjVmMGNkZTRjOGNlZjZkNDRiYmY=

data/CHANGELOG.md

@@ -5,6 +5,15 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## [Unreleased]
 
+## [0.5.3] - 2016-04-02
+### Added
+- check-es-indexes (check for dup indexes) (Yieldbot)
+- check-es-shard-allocation (check ElasticSearch shard allocation persistent and transient settings) (Yieldbot)
+- Adding offset flag to allow specifying of a end time offset
+- Adding custom timestamp field feature to check-es-query-count and check-es-query-exists
+- Added support for https requests (OrbotixInc)
+
+
 ## [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.
@@ -13,7 +22,7 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 ### Added
 - metrics-es-cluster.rb: Added i/o cluster stats
 
-## [0.4.1] - 2016-01-26 
+## [0.4.1] - 2016-01-26
 ### Fixed
 - metrics-es-cluster.rb: Allow metrics to be gathered even if the cluster has zero documents. Also updated cache name for Elasticsearch 2.0+
 - metrics-es-node-graphite.rb: Update node stats for Elasticsearch 2.0+
@@ -76,8 +85,9 @@ 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.4.3...HEAD
-[0.4.2]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/0.4.2...0.4.3
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/0.5.3...HEAD
+[0.5.3]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/0.4.2...0.4.3
+[0.4.3]: 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

data/README.md

@@ -9,13 +9,15 @@
 ## Functionality
 
 ## Files
+* /bin/check-es-circuit-breakers.rb
  * /bin/check-es-cluster-status.rb
  * /bin/check-es-file-descriptors.rb
  * /bin/check-es-heap.rb
+ * /bin/check-es-indexes.rb
  * /bin/check-es-node-status.rb
  * /bin/check-es-query-count.rb
  * /bin/check-es-query-exists.rb
- * /bin/check-es-circuit-breakers.rb
+ * /bin/check-es-shard-allocation
  * /bin/metrics-es-cluster.rb
  * /bin/metrics-es-node.rb
  * /bin/metrics-es-node-graphite.rb

data/bin/check-es-circuit-breakers.rb

@@ -64,13 +64,25 @@ class ESCircuitBreaker < Sensu::Plugin::Check::CLI
          short: '-P PASS',
          long: '--password PASS'
 
+  option :https,
+         description: 'Enables HTTPS',
+         short: '-e',
+         long: '--https'
+
   def get_es_resource(resource)
     headers = {}
     if config[:user] && config[:password]
       auth = 'Basic ' + Base64.encode64("#{config[:user]}:#{config[:password]}").chomp
       headers = { 'Authorization' => auth }
     end
-    r = RestClient::Resource.new("http://#{config[:host]}:#{config[:port]}#{resource}", timeout: config[:timeout], headers: headers)
+
+    protocol = if config[:https]
+                 'https'
+               else
+                 'http'
+               end
+
+    r = RestClient::Resource.new("#{protocol}://#{config[:host]}:#{config[:port]}#{resource}", timeout: config[:timeout], headers: headers)
     JSON.parse(r.get)
   rescue Errno::ECONNREFUSED
     critical 'Connection refused'

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

@@ -78,13 +78,25 @@ class ESClusterStatus < Sensu::Plugin::Check::CLI
          short: '-P PASS',
          long: '--password PASS'
 
+  option :https,
+         description: 'Enables HTTPS',
+         short: '-e',
+         long: '--https'
+
   def get_es_resource(resource)
     headers = {}
     if config[:user] && config[:password]
       auth = 'Basic ' + Base64.encode64("#{config[:user]}:#{config[:password]}").chomp
       headers = { 'Authorization' => auth }
     end
-    r = RestClient::Resource.new("http://#{config[:host]}:#{config[:port]}#{resource}", timeout: config[:timeout], headers: headers)
+
+    protocol = if config[:https]
+                 'https'
+               else
+                 'http'
+               end
+
+    r = RestClient::Resource.new("#{protocol}://#{config[:host]}:#{config[:port]}#{resource}", timeout: config[:timeout], headers: headers)
     JSON.parse(r.get)
   rescue Errno::ECONNREFUSED
     critical 'Connection refused'

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

@@ -77,13 +77,25 @@ class ESFileDescriptors < Sensu::Plugin::Check::CLI
          short: '-P PASS',
          long: '--password PASS'
 
+  option :https,
+         description: 'Enables HTTPS',
+         short: '-e',
+         long: '--https'
+
   def get_es_resource(resource)
     headers = {}
     if config[:user] && config[:password]
       auth = 'Basic ' + Base64.encode64("#{config[:user]}:#{config[:password]}").chomp
       headers = { 'Authorization' => auth }
     end
-    r = RestClient::Resource.new("http://#{config[:host]}:#{config[:port]}#{resource}", timeout: config[:timeout], headers: headers)
+
+    protocol = if config[:https]
+                 'https'
+               else
+                 'http'
+               end
+
+    r = RestClient::Resource.new("#{protocol}://#{config[:host]}:#{config[:port]}#{resource}", timeout: config[:timeout], headers: headers)
     JSON.parse(r.get)
   rescue Errno::ECONNREFUSED
     warning 'Connection refused'

data/bin/check-es-heap.rb

@@ -85,6 +85,11 @@ class ESHeap < Sensu::Plugin::Check::CLI
          short: '-W PASS',
          long: '--password PASS'
 
+  option :https,
+         description: 'Enables HTTPS',
+         short: '-e',
+         long: '--https'
+
   def acquire_es_version
     info = acquire_es_resource('/')
     info['version']['number']
@@ -96,7 +101,14 @@ class ESHeap < Sensu::Plugin::Check::CLI
       auth = 'Basic ' + Base64.encode64("#{config[:user]}:#{config[:password]}").chomp
       headers = { 'Authorization' => auth }
     end
-    r = RestClient::Resource.new("http://#{config[:host]}:#{config[:port]}#{resource}", timeout: config[:timeout], headers: headers)
+
+    protocol = if config[:https]
+                 'https'
+               else
+                 'http'
+               end
+
+    r = RestClient::Resource.new("#{protocol}://#{config[:host]}:#{config[:port]}#{resource}", timeout: config[:timeout], headers: headers)
     JSON.parse(r.get)
   rescue Errno::ECONNREFUSED
     warning 'Connection refused'

data/bin/check-es-indexes.rb

@@ -0,0 +1,89 @@
+#! /usr/bin/env ruby
+#
+# Check Elastic Search Indexes
+# ===
+#
+# DESCRIPTION:
+#   This plugin will check a a node for dupe indexes
+#
+# OUTPUT:
+#   plain-text
+#
+# PLATFORMS:
+#   Linux
+#
+# DEPENDENCIES:
+#   gem: sensu-plugin
+#
+# needs usage
+# USAGE:
+#
+# NOTES:
+#
+# LICENSE:
+#   Copyright 2014 Yieldbot, Inc  <devops@yieldbot.com>
+#   Released under the same terms as Sensu (the MIT license); see LICENSE
+#   for details.
+#
+
+require 'sensu-plugin/check/cli'
+
+#
+# == Check Elastic Search Cluster Index
+#
+class CheckESClusterIndex < Sensu::Plugin::Check::CLI
+  option :cluster,
+         description: 'Array of clusters to check',
+         short: '-C CLUSTER[,CLUSTER]',
+         long: '--cluster CLUSTER[,CLUSTER]',
+         proc: proc { |a| a.split(',') }
+
+  option :ignore,
+         description: 'Comma separated list of indexes to ignore',
+         short: '-i INDEX[,INDEX]',
+         long: '--ignore INDEX[,INDEX]',
+         proc: proc { |a| a.split(',') }
+
+  option :debug,
+         description: 'Debug',
+         short: '-d',
+         long: '--debug'
+
+  def run
+    # If only one cluster is given, no need to check the indexes
+    ok 'All indexes are unique' if config[:cluster].length == 1
+
+    port = ':9200'
+    cmd = '/_cat/indices?v | tail -n +2'
+
+    valid_index = {}
+    dupe_index = {}
+    config[:cluster].each do |u|
+      index_arr = `curl -s #{ u }#{ port }#{ cmd }`.split("\n")
+      index_arr.each do |t|
+        t = t.split[1]
+
+        # If the index is in the ignore list, go to the next one
+        next if config[:ignore].include? t
+
+        if valid_index.key?(t)
+          dupe_index[t] = [] unless dupe_index[t].is_a?(Array)
+          dupe_index[t] << u
+          dupe_index[t] << valid_index[t] unless dupe_index[t]
+                                                 .include?(valid_index[t])
+        else
+          valid_index[t] = [] unless valid_index[t].is_a?(Array)
+          valid_index[t] << u
+        end
+      end
+    end
+
+    if dupe_index.count > 0
+      dupe_index.each do |k, v|
+        critical "#{k} is on #{v}"
+      end
+    else
+      ok 'All indexes are unique'
+    end
+  end
+end

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

@@ -63,13 +63,25 @@ class ESNodeStatus < Sensu::Plugin::Check::CLI
          short: '-P PASS',
          long: '--password PASS'
 
+  option :https,
+         description: 'Enables HTTPS',
+         short: '-e',
+         long: '--https'
+
   def get_es_resource(resource)
     headers = {}
     if config[:user] && config[:password]
       auth = 'Basic ' + Base64.encode64("#{config[:user]}:#{config[:password]}").chomp
       headers = { 'Authorization' => auth }
     end
-    r = RestClient::Resource.new("http://#{config[:host]}:#{config[:port]}#{resource}", timeout: config[:timeout], headers: headers)
+
+    protocol = if config[:https]
+                 'https'
+               else
+                 'http'
+               end
+
+    r = RestClient::Resource.new("#{protocol}://#{config[:host]}:#{config[:port]}#{resource}", timeout: config[:timeout], headers: headers)
     r.get
   rescue Errno::ECONNREFUSED
     critical 'Connection refused'

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

@@ -54,32 +54,43 @@ class ESQueryCount < Sensu::Plugin::Check::CLI
          description: 'Elasticsearch types to limit searches to, comma separated list.',
          long: '--types TYPES'
 
+  option :timestamp_field,
+         description: 'Field to use instead of @timestamp for query.',
+         long: '--timestamp-field FIELD_NAME',
+         default: '@timestamp'
+
+  option :offset,
+         description: 'Seconds before offset to end @timestamp against query.',
+         long: '--offset OFFSET',
+         proc: proc(&:to_i),
+         default: 0
+
   option :minutes_previous,
-         description: 'Minutes before now to check @timestamp against query.',
+         description: 'Minutes before offset to check @timestamp against query.',
          long: '--minutes-previous MINUTES_PREVIOUS',
          proc: proc(&:to_i),
          default: 0
 
   option :hours_previous,
-         description: 'Hours before now to check @timestamp against query.',
+         description: 'Hours before offset to check @timestamp against query.',
          long: '--hours-previous HOURS_PREVIOUS',
          proc: proc(&:to_i),
          default: 0
 
   option :days_previous,
-         description: 'Days before now to check @timestamp against query.',
+         description: 'Days before offset to check @timestamp against query.',
          long: '--days-previous DAYS_PREVIOUS',
          proc: proc(&:to_i),
          default: 0
 
   option :weeks_previous,
-         description: 'Weeks before now to check @timestamp against query.',
+         description: 'Weeks before offset to check @timestamp against query.',
          long: '--weeks-previous WEEKS_PREVIOUS',
          proc: proc(&:to_i),
          default: 0
 
   option :months_previous,
-         description: 'Months before now to check @timestamp against query.',
+         description: 'Months before offset to check @timestamp against query.',
          long: '--months-previous MONTHS_PREVIOUS',
          proc: proc(&:to_i),
          default: 0

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

@@ -55,32 +55,43 @@ class ESQueryExists < Sensu::Plugin::Check::CLI
          description: 'Elasticsearch types to limit searches to, comma separated list.',
          long: '--types TYPES'
 
+  option :timestamp_field,
+         description: 'Field to use instead of @timestamp for query.',
+         long: '--timestamp_field FIELD_NAME',
+         default: '@timestamp'
+
+  option :offset,
+         description: 'Seconds before offset to end @timestamp against query.',
+         long: '--offset OFFSET',
+         proc: proc(&:to_i),
+         default: 0
+
   option :minutes_previous,
-         description: 'Minutes before now to check @timestamp against query.',
+         description: 'Minutes before offset to check @timestamp against query.',
          long: '--minutes-previous MINUTES_PREVIOUS',
          proc: proc(&:to_i),
          default: 0
 
   option :hours_previous,
-         description: 'Hours before now to check @timestamp against query.',
+         description: 'Hours before offset to check @timestamp against query.',
          long: '--hours-previous DAYS_PREVIOUS',
          proc: proc(&:to_i),
          default: 0
 
   option :days_previous,
-         description: 'Days before now to check @timestamp against query.',
+         description: 'Days before offset to check @timestamp against query.',
          long: '--days-previous DAYS_PREVIOUS',
          proc: proc(&:to_i),
          default: 0
 
   option :weeks_previous,
-         description: 'Weeks before now to check @timestamp against query.',
+         description: 'Weeks before offset to check @timestamp against query.',
          long: '--weeks-previous WEEKS_PREVIOUS',
          proc: proc(&:to_i),
          default: 0
 
   option :months_previous,
-         description: 'Months before now to check @timestamp against query.',
+         description: 'Months before offset to check @timestamp against query.',
          long: '--months-previous MONTHS_PREVIOUS',
          proc: proc(&:to_i),
          default: 0

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

@@ -0,0 +1,96 @@
+#! /usr/bin/env ruby
+#
+# Checks ElasticSearch shard allocation setting status
+# ===
+#
+# DESCRIPTION:
+#   Checks the ElasticSearch shard allocation persistent and transient settings
+#   and will return status based on a difference in those settings.
+#
+# OUTPUT:
+#   plain-text
+#
+# PLATFORMS:
+#   Linux
+#
+# DEPENDENCIES:
+#   gem: sensu-plugin
+#   gem: rest-client
+#
+# USAGE:
+#
+# NOTES:
+#
+# LICENSE:
+#   Copyright 2014 Yieldbot, Inc  <devops@yieldbot.com>
+#   Released under the same terms as Sensu (the MIT license); see LICENSE
+#   for details.
+#
+
+require 'sensu-plugin/check/cli'
+require 'rest-client'
+require 'json'
+
+#
+# == Elastic Search Shard Allocation Status
+#
+class ESShardAllocationStatus < Sensu::Plugin::Check::CLI
+  option :scheme,
+         description: 'URI scheme',
+         long: '--scheme SCHEME',
+         default: 'http'
+
+  option :server,
+         description: 'Elasticsearch server',
+         short: '-s SERVER',
+         long: '--server SERVER',
+         default: 'localhost'
+
+  option :port,
+         description: 'Port',
+         short: '-p PORT',
+         long: '--port PORT',
+         default: '9200'
+
+  def get_es_resource(resource)
+    r = RestClient::Resource.new("#{config[:scheme]}://#{config[:server]}:#{config[:port]}/#{resource}", timeout: 45)
+    JSON.parse(r.get)
+  rescue Errno::ECONNREFUSED
+    warning 'Connection refused'
+  rescue RestClient::RequestTimeout
+    warning 'Connection timed out'
+  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')
+    local = get_es_resource('/_nodes/_local')
+    local['nodes'].keys.first == state['master_node']
+  end
+
+  def get_status(type)
+    settings = get_es_resource('/_cluster/settings')
+    # Get the status for the given type, or default to 'all'
+    # which is the ES default
+    begin
+      settings[type]['cluster']['routing']['allocation']['enable'].downcase
+    rescue
+      'all'
+    end
+  end
+
+  def run
+    if master?
+      transient   = get_status('transient')
+      persistent  = get_status('persistent')
+
+      if transient == persistent
+        ok "Persistent and transient allocation match:  #{persistent}"
+      else
+        critical "Persistent(#{persistent}) and transient(#{transient}) \
+        shard allocation do not match."
+      end
+    else
+      ok 'Not the master'
+    end
+  end
+end

data/bin/metrics-es-cluster.rb

@@ -85,6 +85,11 @@ class ESClusterMetrics < Sensu::Plugin::Metric::CLI::Graphite
          short: '-P PASS',
          long: '--password PASS'
 
+  option :https,
+         description: 'Enables HTTPS',
+         short: '-e',
+         long: '--https'
+
   def acquire_es_version
     info = get_es_resource('/')
     info['version']['number']
@@ -96,7 +101,14 @@ class ESClusterMetrics < Sensu::Plugin::Metric::CLI::Graphite
       auth = 'Basic ' + Base64.encode64("#{config[:user]}:#{config[:password]}").chomp
       headers = { 'Authorization' => auth }
     end
-    r = RestClient::Resource.new("http://#{config[:host]}:#{config[:port]}#{resource}", timeout: config[:timeout], headers: headers)
+
+    protocol = if config[:https]
+                 'https'
+               else
+                 'http'
+               end
+
+    r = RestClient::Resource.new("#{protocol}://#{config[:host]}:#{config[:port]}#{resource}", timeout: config[:timeout], headers: headers)
     JSON.parse(r.get)
   rescue Errno::ECONNREFUSED
     warning 'Connection refused'

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

@@ -110,13 +110,25 @@ class ESNodeGraphiteMetrics < Sensu::Plugin::Metric::CLI::Graphite
          short: '-P PASS',
          long: '--password PASS'
 
+  option :https,
+         description: 'Enables HTTPS',
+         short: '-e',
+         long: '--https'
+
   def get_es_resource(resource)
     headers = {}
     if config[:user] && config[:password]
       auth = 'Basic ' + Base64.encode64("#{config[:user]}:#{config[:password]}").chomp
       headers = { 'Authorization' => auth }
     end
-    r = RestClient::Resource.new("http://#{config[:server]}:#{config[:port]}#{resource}?pretty", timeout: config[:timeout], headers: headers)
+
+    protocol = if config[:https]
+                 'https'
+               else
+                 'http'
+               end
+
+    r = RestClient::Resource.new("#{protocol}://#{config[:server]}:#{config[:port]}#{resource}?pretty", timeout: config[:timeout], headers: headers)
     JSON.parse(r.get)
   rescue Errno::ECONNREFUSED
     warning 'Connection refused'

data/bin/metrics-es-node.rb

@@ -66,6 +66,11 @@ class ESMetrics < Sensu::Plugin::Metric::CLI::Graphite
          short: '-P PASS',
          long: '--password PASS'
 
+  option :https,
+         description: 'Enables HTTPS',
+         short: '-e',
+         long: '--https'
+
   def acquire_es_version
     info = get_es_resource('/')
     info['version']['number']
@@ -77,7 +82,14 @@ class ESMetrics < Sensu::Plugin::Metric::CLI::Graphite
       auth = 'Basic ' + Base64.encode64("#{config[:user]}:#{config[:password]}").chomp
       headers = { 'Authorization' => auth }
     end
-    r = RestClient::Resource.new("http://#{config[:host]}:#{config[:port]}#{resource}", timeout: config[:timeout], headers: headers)
+
+    protocol = if config[:https]
+                 'https'
+               else
+                 'http'
+               end
+
+    r = RestClient::Resource.new("#{protocol}://#{config[:host]}:#{config[:port]}#{resource}", timeout: config[:timeout], headers: headers)
     JSON.parse(r.get)
   rescue Errno::ECONNREFUSED
     warning 'Connection refused'

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

@@ -21,12 +21,13 @@ module ElasticsearchQuery
     super()
   end
 
-  def indices
+  def indices(end_time)
     if !config[:index].nil?
       return config[:index]
     elsif !config[:date_index].nil?
       indices = []
-      curr = Time.now.utc.to_i
+
+      curr = end_time.to_i
       start = curr
 
       if config[:minutes_previous] != 0
@@ -60,15 +61,17 @@ module ElasticsearchQuery
   end
 
   def build_request_options
+    end_time = (Time.now.utc - config[:offset])
     options = {
-      index: indices,
+      index: indices(end_time),
       ignore_unavailable: true
     }
+
     if !config[:body].nil?
       options[:body] = config[:body]
     else
-      es_date_filter = es_date_math_string
-      unless es_date_filter.nil?
+      es_date_start = es_date_math_string end_time
+      unless es_date_start.nil?
         options[:body] = {
           'query' => {
             'filtered' => {
@@ -80,7 +83,10 @@ module ElasticsearchQuery
               },
               'filter' => {
                 'range' => {
-                  '@timestamp' => { 'gt' => es_date_filter }
+                  config[:timestamp_field] => {
+                    'gt' => es_date_start,
+                    'lt' => end_time.strftime('%Y-%m-%dT%H:%M:%S')
+                  }
                 }
               }
             }
@@ -94,7 +100,7 @@ module ElasticsearchQuery
     options
   end
 
-  def es_date_math_string
+  def es_date_math_string(end_time)
     if config[:minutes_previous] == 0 && \
        config[:hours_previous] == 0 && \
        config[:days_previous] == 0 && \
@@ -102,22 +108,12 @@ module ElasticsearchQuery
        config[:months_previous] == 0
       return nil
     else
-      es_math = "#{Time.now.utc.strftime '%Y-%m-%dT%H:%M:%S'}||"
-      if config[:minutes_previous] != 0
-        es_math += "-#{config[:minutes_previous]}m"
-      end
-      if config[:hours_previous] != 0
-        es_math += "-#{config[:hours_previous]}h"
-      end
-      if config[:days_previous] != 0
-        es_math += "-#{config[:days_previous]}d"
-      end
-      if config[:weeks_previous] != 0
-        es_math += "-#{config[:weeks_previous]}w"
-      end
-      if config[:months_previous] != 0
-        es_math += "-#{config[:months_previous]}M"
-      end
+      es_math = "#{end_time.strftime '%Y-%m-%dT%H:%M:%S'}||"
+      es_math += "-#{config[:minutes_previous]}m" if config[:minutes_previous] != 0
+      es_math += "-#{config[:hours_previous]}h" if config[:hours_previous] != 0
+      es_math += "-#{config[:days_previous]}d" if config[:days_previous] != 0
+      es_math += "-#{config[:weeks_previous]}w" if config[:weeks_previous] != 0
+      es_math += "-#{config[:months_previous]}M" if config[:months_previous] != 0
       return es_math
     end
   end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.3
 platform: ruby
 authors:
 - Sensu Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -187,9 +187,11 @@ executables:
 - check-es-cluster-status.rb
 - check-es-file-descriptors.rb
 - check-es-heap.rb
+- check-es-indexes.rb
 - check-es-node-status.rb
 - check-es-query-count.rb
 - check-es-query-exists.rb
+- check-es-shard-allocation-status.rb
 - metrics-es-cluster.rb
 - metrics-es-node-graphite.rb
 - metrics-es-node.rb
@@ -203,9 +205,11 @@ files:
 - bin/check-es-cluster-status.rb
 - bin/check-es-file-descriptors.rb
 - bin/check-es-heap.rb
+- bin/check-es-indexes.rb
 - bin/check-es-node-status.rb
 - bin/check-es-query-count.rb
 - bin/check-es-query-exists.rb
+- bin/check-es-shard-allocation-status.rb
 - bin/metrics-es-cluster.rb
 - bin/metrics-es-node-graphite.rb
 - bin/metrics-es-node.rb