sensu-plugins-elasticsearch 0.5.3 → 1.0.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YjkwYTFiOWMzYjAzMzY0OTNiZjE5ZDZkNWY3NTliNzJiMGU2NWQ4ZQ==
-  data.tar.gz: !binary |-
-    OWI1ZTYzMjU5NTM1MzljZDA5NTlkOTViYThiNzBlZDY0ODQ2NTA1Yg==
+SHA1:
+  metadata.gz: 916ac07d3bae1f72dfe1b147803712caf0051397
+  data.tar.gz: 49eb92c702d9b07a3f7d607f0cf412e32acf230d
 SHA512:
-  metadata.gz: !binary |-
-    MGNhNjRjZWEzZjQ2OTBlYjI5OTJjY2Y5YmFmOTc5ZTE2YjFhODNjYjc2OWMy
-    YmQ0OWMyZWRlMWJjYTMwODU2MzQxNjc3ZjFmYTI2ZTliODI1ODQxMmFmOGQz
-    ZDNkNjFkNTU5OTFhYjdiNWEzYjQ2NzAyMDc2MTIwNzAxNmMwODQ=
-  data.tar.gz: !binary |-
-    MzYyODViMzE4OTExZGU1Y2RjMWJkY2UzNTVjMGZiY2Q1Y2QzNGJjZGY2NGQ0
-    YTRkOWEzNTA0MThkYzE5ZDI1NjNhOWM1YjAyMGQwNzk5MjQ3ZDAzMzY0N2I1
-    YTUzNDJhYTRmMTJlMDFiNzIzMjVmMGNkZTRjOGNlZjZkNDRiYmY=
+  metadata.gz: 6e1845230c4cf9911e5843f032d56bfee2cbdeccc370bf43ed5d0873665dca17b1e3c51b01416b5aac9ca008f77ae619da5804f095edbd925b76975c57c46f29
+  data.tar.gz: 80a2ea4fc5e0ebe877eb57f76d4510fee044fa95c1bd871c9813195109233462b890dc06957c887c197ad73fa455ee417a699b99d662f279787de8d087460f82

data/CHANGELOG.md

@@ -5,6 +5,27 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## [Unreleased]
 
+## [1.0.0] - 2016-07-29
+### Added
+- Added AWS transport gem and configuration for check-es-query-* sensu calls to use --transport=AWS (@brendangibat)
+- Added a rescue for 503 on several checks: (@majormoses)
+ - check-es-circuit-breakers.rb
+ - check-es-cluster-status.rb
+ - check-es-file-descriptors.rb
+ - check-es-heap.rb
+- Added option --localhost for check-es-circuit-breakers.rb to only check its local node for broken circuit (@majormoses)
+- Add Ruby 2.3.0 support (@eheydrick)
+- Allow using newer patch versions of elasticsearch gem within the same minor (@majormoses)
+- Add check-es-cluster-health to check Elasticsearch cluster health and status (@brendangibat)
+- Add check-es-indices-size to check if indicies grow above a certain size (@brendangibat)
+- Add handler-es-delete-indices handler to delete indicies (@brendangibat)
+
+### Removed
+- Ruby 1.9.3 support (@eheydrick)
+
+### Changed
+- Update to Rubocop 0.40 and cleanup (@eheydrick)
+
 ## [0.5.3] - 2016-04-02
 ### Added
 - check-es-indexes (check for dup indexes) (Yieldbot)
@@ -47,6 +68,7 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 - Update elasticsearch gem to 1.0.14
 
 ### Added
+- Add check-es-cluster-health that checks health status with elasticsearch gem and can use AWS transport for checks.
 - Add check-es-circuit-breakers.rb, to alert when circuit breakers have been tripped
 
 ## [0.2.0] - 2015-10-15
@@ -85,8 +107,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.5.3...HEAD
-[0.5.3]: 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/1.0.0...HEAD
+[1.0.0]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/0.5.3...1.0.0
+[0.5.3]: https://github.com/sensu-plugins/sensu-plugins-elasticsearch/compare/0.4.3...0.5.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

data/README.md

@@ -9,15 +9,18 @@
 ## Functionality
 
 ## Files
-* /bin/check-es-circuit-breakers.rb
+ * /bin/check-es-circuit-breakers.rb
+ * /bin/check-es-cluster-health.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-indicies-sizes.rb
  * /bin/check-es-node-status.rb
  * /bin/check-es-query-count.rb
  * /bin/check-es-query-exists.rb
- * /bin/check-es-shard-allocation
+ * /bin/check-es-shard-allocation-status.rb
+ * /bin/handler-es-delete-indices.rb
  * /bin/metrics-es-cluster.rb
  * /bin/metrics-es-node.rb
  * /bin/metrics-es-node-graphite.rb

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

@@ -69,6 +69,13 @@ class ESCircuitBreaker < Sensu::Plugin::Check::CLI
          short: '-e',
          long: '--https'
 
+  option :localhost,
+         description: 'only check local node',
+         short: '-l',
+         long: '--localhost',
+         boolean: true,
+         default: false
+
   def get_es_resource(resource)
     headers = {}
     if config[:user] && config[:password]
@@ -88,13 +95,19 @@ class ESCircuitBreaker < Sensu::Plugin::Check::CLI
     critical 'Connection refused'
   rescue RestClient::RequestTimeout
     critical 'Connection timed out'
+  rescue RestClient::ServiceUnavailable
+    warning 'Service is unavailable'
   rescue Errno::ECONNRESET
     critical 'Connection reset by peer'
   end
 
   def breaker_status
     breakers = {}
-    status = get_es_resource('/_nodes/stats/breaker')
+    status = if config[:localhost]
+               get_es_resource('/_nodes/_local/stats/breaker')
+             else
+               get_es_resource('/_nodes/stats/breaker')
+             end
     status['nodes'].each_pair do |_node, stat|
       host = stat['host']
       breakers[host] = {}

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

@@ -0,0 +1,118 @@
+#! /usr/bin/env ruby
+#
+#   check-es-cluster-health
+#
+# DESCRIPTION:
+#   This plugin checks the ElasticSearch cluster health and status.
+#
+# OUTPUT:
+#   plain text
+#
+# PLATFORMS:
+#   Linux
+#
+# DEPENDENCIES:
+#   gem: sensu-plugin
+#   gem: elasticsearch
+#   gem: aws_es_transport
+#
+# USAGE:
+#   Checks against the ElasticSearch api for cluster health using the
+#     elasticsearch gem
+#
+# NOTES:
+#
+# LICENSE:
+#   Brendan Gibat <brendan.gibat@gmail.com>
+#   Released under the same terms as Sensu (the MIT license); see LICENSE
+#   for details.
+#
+
+require 'sensu-plugin/check/cli'
+require 'elasticsearch'
+require 'aws_es_transport'
+require 'sensu-plugins-elasticsearch'
+
+#
+# ES Cluster Health
+#
+class ESClusterHealth < Sensu::Plugin::Check::CLI
+  include ElasticsearchCommon
+
+  option :transport,
+         long: '--transport TRANSPORT',
+         description: 'Transport to use to communicate with ES. Use "AWS" for signed AWS transports.'
+
+  option :region,
+         long: '--region REGION',
+         description: 'Region (necessary for AWS Transport)'
+
+  option :host,
+         description: 'Elasticsearch host',
+         short: '-h HOST',
+         long: '--host HOST',
+         default: 'localhost'
+
+  option :level,
+         description: 'Level of detail to check returend information ("cluster", "indices", "shards").',
+         short: '-l LEVEL',
+         long: '--level LEVEL'
+
+  option :local,
+         description: 'Return local information, do not retrieve the state from master node.',
+         long: '--local',
+         boolean: true
+
+  option :port,
+         description: 'Elasticsearch port',
+         short: '-p PORT',
+         long: '--port PORT',
+         proc: proc(&:to_i),
+         default: 9200
+
+  option :scheme,
+         description: 'Elasticsearch connection scheme, defaults to https for authenticated connections',
+         short: '-s SCHEME',
+         long: '--scheme SCHEME'
+
+  option :password,
+         description: 'Elasticsearch connection password',
+         short: '-P PASSWORD',
+         long: '--password PASSWORD'
+
+  option :user,
+         description: 'Elasticsearch connection user',
+         short: '-u USER',
+         long: '--user USER'
+
+  option :timeout,
+         description: 'Elasticsearch query timeout in seconds',
+         short: '-t TIMEOUT',
+         long: '--timeout TIMEOUT',
+         proc: proc(&:to_i),
+         default: 30
+
+  def run
+    options = {}
+    unless config[:level].nil?
+      options[:level] = config[:level]
+    end
+    unless config[:local].nil?
+      options[:local] = config[:local]
+    end
+    unless config[:index].nil?
+      options[:index] = config[:index]
+    end
+    health = client.cluster.health options
+    case health['status']
+    when 'yellow'
+      warning 'Cluster state is Yellow'
+    when 'red'
+      critical 'Cluster state is Red'
+    when 'green'
+      ok
+    else
+      unknown "Cluster state is in an unknown health: #{health['status']}"
+    end
+  end
+end

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

@@ -102,6 +102,8 @@ class ESClusterStatus < Sensu::Plugin::Check::CLI
     critical 'Connection refused'
   rescue RestClient::RequestTimeout
     critical 'Connection timed out'
+  rescue RestClient::ServiceUnavailable
+    critical 'Service is unavailable'
   rescue Errno::ECONNRESET
     critical 'Connection reset by peer'
   end

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

@@ -101,6 +101,8 @@ class ESFileDescriptors < Sensu::Plugin::Check::CLI
     warning 'Connection refused'
   rescue RestClient::RequestTimeout
     warning 'Connection timed out'
+  rescue RestClient::ServiceUnavailable
+    warning 'Service is unavailable'
   end
 
   def acquire_es_version

data/bin/check-es-heap.rb

@@ -114,6 +114,8 @@ class ESHeap < Sensu::Plugin::Check::CLI
     warning 'Connection refused'
   rescue RestClient::RequestTimeout
     warning 'Connection timed out'
+  rescue RestClient::ServiceUnavailable
+    warning 'Service is unavailable'
   rescue JSON::ParserError
     warning 'Elasticsearch API returned invalid JSON'
   end

data/bin/check-es-indices-sizes.rb

@@ -0,0 +1,185 @@
+#! /usr/bin/env ruby
+#
+#   check-es-indices-sizes.rb
+#
+# DESCRIPTION:
+#   This check sends a critical event when the indices mathing the date pattern
+#     are above a MB value.
+#
+# OUTPUT:
+#   plain text
+#
+# PLATFORMS:
+#   Linux
+#
+# DEPENDENCIES:
+#   gem: sensu-plugin
+#   gem: elasticsearch
+#   gem: aws_es_transport
+#
+# USAGE:
+#   ./check-es-indices-sizes.rb -h localhost -p 9200 -m 155000
+#
+# NOTES:
+#
+# LICENSE:
+#   Brendan Leon Gibat <brendan.gibat@gmail.com>
+#   Released under the same terms as Sensu (the MIT license); see LICENSE
+#   for details.
+#
+
+require 'sensu-plugin/check/cli'
+require 'elasticsearch'
+require 'aws_es_transport'
+require 'sensu-plugins-elasticsearch'
+
+class ESCheckIndicesSizes < Sensu::Plugin::Check::CLI
+  include ElasticsearchCommon
+
+  option :transport,
+         long: '--transport TRANSPORT',
+         description: 'Transport to use to communicate with ES. Use "AWS" for signed AWS transports.'
+
+  option :region,
+         long: '--region REGION',
+         description: 'Region (necessary for AWS Transport)'
+
+  option :host,
+         description: 'Elasticsearch host',
+         short: '-h HOST',
+         long: '--host HOST',
+         default: 'localhost'
+
+  option :port,
+         description: 'Elasticsearch port',
+         short: '-p PORT',
+         long: '--port PORT',
+         proc: proc(&:to_i),
+         default: 9200
+
+  option :scheme,
+         description: 'Elasticsearch connection scheme, defaults to https for authenticated connections',
+         short: '-s SCHEME',
+         long: '--scheme SCHEME'
+
+  option :password,
+         description: 'Elasticsearch connection password',
+         short: '-P PASSWORD',
+         long: '--password PASSWORD'
+
+  option :user,
+         description: 'Elasticsearch connection user',
+         short: '-u USER',
+         long: '--user USER'
+
+  option :timeout,
+         description: 'Elasticsearch query timeout in seconds',
+         short: '-t TIMEOUT',
+         long: '--timeout TIMEOUT',
+         proc: proc(&:to_i),
+         default: 30
+
+  option :used_percent,
+         description: 'Percentage of bytes to use for indices matching pattern.',
+         short: '-a USED_PERCENTAGE',
+         long: '--used-percentage USED_PERCENTAGE',
+         proc: proc(&:to_i),
+         default: 80
+
+  option :maximum_megabytes,
+         description: 'Maximum number megabytes for date based indices to use.',
+         short: '-m MAXIMUM_MEGABYTES',
+         long: '--maximum-megabytes MAXIMUM_MEGABYTES',
+         proc: proc(&:to_i),
+         default: 0
+
+  option :pattern_regex,
+         description: 'Regular expression to use for matching date based indices. Four named groups are matched, pattern, year, month, day.',
+         short: '-x PATTERN_REGEX',
+         long: '--pattern-regex PATTERN_REGEX',
+         default: '^(?<pattern>.*)-(?<year>\d\d\d\d)\.(?<month>\d\d?).(?<day>\d\d?)$'
+
+  def get_indices_to_delete(starting_date, total_bytes_to_delete, indices_with_sizes)
+    total_bytes_deleted = 0
+    curr_date = DateTime.now
+
+    indices_to_delete = []
+
+    # We don't delete the current day, as it is most likely being used.
+    while total_bytes_deleted < total_bytes_to_delete && starting_date < curr_date
+      same_day_indices = indices_with_sizes.values.map do |pattern|
+        pattern.select do |index|
+          index['date'] == starting_date
+        end
+      end.flatten
+      same_day_indices.each do |index|
+        if total_bytes_deleted < total_bytes_to_delete
+          indices_to_delete.push(index['index'])
+          total_bytes_deleted += index['size']
+        end
+      end
+      starting_date += 1
+    end
+
+    indices_to_delete
+  end
+
+  def build_indices_with_sizes
+    indices_fs_stats = client.indices.stats store: true
+    pattern_regex = Regexp.new(config[:pattern_regex])
+
+    index_with_sizes = indices_fs_stats['indices'].keys.each_with_object({}) do |key, hash|
+      matching_index = pattern_regex.match(key)
+      unless matching_index.nil?
+        base_pattern = matching_index[:pattern]
+        unless base_pattern.nil?
+          unless hash.include?(base_pattern)
+            hash[base_pattern] = []
+          end
+          index_date = DateTime.new(matching_index[:year].to_i, matching_index[:month].to_i, matching_index[:day].to_i)
+          hash[base_pattern].push(
+            size: indices_fs_stats['indices'][key]['total']['store']['size_in_bytes'].to_i,
+            date: index_date,
+            index: key
+          )
+        end
+      end
+    end
+
+    index_with_sizes
+  end
+
+  def run
+    node_fs_stats = client.nodes.stats metric: 'fs,indices'
+    nodes_being_used = node_fs_stats['nodes'].values.select { |node| node['indices']['store']['size_in_bytes'] > 0 }
+    # rubocop:disable SingleLineBlockParams
+    # rubocop:disable LineLength
+    used_in_bytes = nodes_being_used.map { |node| node['fs']['data'].map { |data| data['total_in_bytes'] - data['available_in_bytes'] }.flatten }.flatten.inject { |sum, x| sum + x }
+    # rubocop:enable LineLength
+    total_in_bytes = nodes_being_used.map { |node| node['fs']['data'].map { |data| data['total_in_bytes'] }.flatten }.flatten.inject { |sum, x| sum + x }
+    # rubocop:enable SingleLineBlockParams
+
+    if config[:maximum_megabytes] > 0
+      target_bytes_used = config[:maximum_megabytes] * 1_000_000
+    else
+      if config[:used_percent] > 100 || config[:used_percent] < 0
+        critical 'You can not make used-percentages greater than 100 or less than 0.'
+      end
+      target_bytes_used = (total_in_bytes.to_f * (config[:used_percent].to_f / 100.0)).to_i
+    end
+
+    total_bytes_to_delete = used_in_bytes - target_bytes_used
+    if total_bytes_to_delete <= 0
+      ok "Used space in bytes: #{used_in_bytes}, Total in bytes: #{total_in_bytes}"
+    end
+
+    indices_with_sizes = build_indices_with_sizes
+
+    oldest = indices_with_sizes.values.flatten.map { |index| index['date'] }.min
+    indices_to_delete = get_indices_to_delete(oldest, total_bytes_to_delete, indices_with_sizes)
+
+    critical "Not enough space, #{total_bytes_to_delete} bytes need to be deleted. Used space in bytes: " \
+      "#{used_in_bytes}, Total in bytes: #{total_in_bytes}. Indices to delete: " \
+      "#{indices_to_delete.sort.map { |i| "INDEX[#{i}]" }.join(', ')}"
+  end
+end

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

@@ -14,6 +14,7 @@
 # DEPENDENCIES:
 #   gem: sensu-plugin
 #   gem: elasticsearch
+#   gem: aws_es_transport
 #
 # USAGE:
 #   This example checks that the count of special_type logs matching a query of
@@ -34,10 +35,12 @@
 require 'sensu-plugin/check/cli'
 require 'elasticsearch'
 require 'time'
+require 'uri'
+require 'aws_es_transport'
 require 'sensu-plugins-elasticsearch'
 
 #
-# ES Heap
+# ES Query Count
 #
 class ESQueryCount < Sensu::Plugin::Check::CLI
   include ElasticsearchCommon
@@ -50,6 +53,14 @@ class ESQueryCount < Sensu::Plugin::Check::CLI
          short: '-i INDEX',
          long: '--indices INDEX'
 
+  option :transport,
+         long: '--transport TRANSPORT',
+         description: 'Transport to use to communicate with ES. Use "AWS" for signed AWS transports.'
+
+  option :region,
+         long: '--region REGION',
+         description: 'Region (necessary for AWS Transport)'
+
   option :types,
          description: 'Elasticsearch types to limit searches to, comma separated list.',
          long: '--types TYPES'
@@ -65,6 +76,12 @@ class ESQueryCount < Sensu::Plugin::Check::CLI
          proc: proc(&:to_i),
          default: 0
 
+  option :ignore_unavailable,
+         description: 'Ignore unavailable indices.',
+         long: '--ignore-unavailable',
+         boolean: true,
+         default: true
+
   option :minutes_previous,
          description: 'Minutes before offset to check @timestamp against query.',
          long: '--minutes-previous MINUTES_PREVIOUS',
@@ -142,8 +159,7 @@ class ESQueryCount < Sensu::Plugin::Check::CLI
   option :scheme,
          description: 'Elasticsearch connection scheme, defaults to https for authenticated connections',
          short: '-s SCHEME',
-         long: '--scheme SCHEME',
-         default: 'https'
+         long: '--scheme SCHEME'
 
   option :password,
          description: 'Elasticsearch connection password',
@@ -181,31 +197,68 @@ class ESQueryCount < Sensu::Plugin::Check::CLI
          description: 'Invert thresholds',
          boolean: true
 
+  option :kibana_url,
+         long: '--kibana-url KIBANA_URL',
+         description: 'Kibana URL query prefix that will be in critical / warning response output.'
+
+  def kibana_info
+    kibana_date_format = '%Y-%m-%dT%H:%M:%S.%LZ'
+    unless config[:kibana_url].nil?
+      index = config[:index]
+      unless config[:date_index].nil?
+        date_index_partition = config[:date_index].split('%')
+        index = "[#{date_index_partition.first}]" \
+          "#{date_index_partition[1..-1].join.sub('Y', 'YYYY').sub('y', 'YY').sub('m', 'MM').sub('d', 'DD').sub('j', 'DDDD').sub('H', 'hh')}"
+      end
+      end_time = Time.now.utc.to_i
+      start_time = end_time
+      if config[:minutes_previous] != 0
+        start_time -= (config[:minutes_previous] * 60)
+      end
+      if config[:hours_previous] != 0
+        start_time -= (config[:hours_previous] * 60 * 60)
+      end
+      if config[:days_previous] != 0
+        start_time -= (config[:days_previous] * 60 * 60 * 24)
+      end
+      if config[:weeks_previous] != 0
+        start_time -= (config[:weeks_previous] * 60 * 60 * 24 * 7)
+      end
+      if config[:months_previous] != 0
+        start_time -= (config[:months_previous] * 60 * 60 * 24 * 7 * 31)
+      end
+      "Kibana logs: #{config[:kibana_url]}/#/discover?_g=" \
+      "(refreshInterval:(display:Off,section:0,value:0),time:(from:'" \
+      "#{URI.escape(Time.at(start_time).utc.strftime kibana_date_format)}',mode:absolute,to:'" \
+      "#{URI.escape(Time.at(end_time).utc.strftime kibana_date_format)}'))&_a=(columns:!(_source),index:" \
+      "#{URI.escape(index)},interval:auto,query:(query_string:(analyze_wildcard:!t,query:'" \
+      "#{URI.escape(config[:query])}')),sort:!('@timestamp',desc))&dummy"
+    end
+  end
+
   def run
     response = client.count(build_request_options)
     if config[:invert]
       if response['count'] < config[:crit]
-        critical "Query count (#{response['count']}) was below critical threshold"
+        critical "Query count (#{response['count']}) was below critical threshold. #{kibana_info}"
       elsif response['count'] < config[:warn]
-        warning "Query count (#{response['count']}) was below warning threshold"
+        warning "Query count (#{response['count']}) was below warning threshold. #{kibana_info}"
       else
         ok "Query count (#{response['count']}) was ok"
       end
+    elsif response['count'] > config[:crit]
+      critical "Query count (#{response['count']}) was above critical threshold. #{kibana_info}"
+    elsif response['count'] > config[:warn]
+      warning "Query count (#{response['count']}) was above warning threshold. #{kibana_info}"
     else
-      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"
-      else
-        ok "Query count (#{response['count']}) was ok"
-      end
+      ok "Query count (#{response['count']}) was ok"
     end
   rescue Elasticsearch::Transport::Transport::Errors::NotFound
     if config[:invert]
       if response['count'] < config[:crit]
-        critical "Query count (#{response['count']}) was below critical threshold"
+        critical "Query count (#{response['count']}) was below critical threshold. #{kibana_info}"
       elsif response['count'] < config[:warn]
-        warning "Query count (#{response['count']}) was below warning threshold"
+        warning "Query count (#{response['count']}) was below warning threshold. #{kibana_info}"
       else
         ok "Query count (#{response['count']}) was ok"
       end

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

@@ -35,10 +35,12 @@
 
 require 'sensu-plugin/check/cli'
 require 'elasticsearch'
+require 'time'
+require 'aws_es_transport'
 require 'sensu-plugins-elasticsearch'
 
 #
-# ES Heap
+# ES Query Exists
 #
 class ESQueryExists < Sensu::Plugin::Check::CLI
   include ElasticsearchCommon
@@ -51,6 +53,14 @@ class ESQueryExists < Sensu::Plugin::Check::CLI
          short: '-i INDEX',
          long: '--indices INDEX'
 
+  option :transport,
+         long: '--transport TRANSPORT',
+         description: 'Transport to use to communicate with ES. Use "AWS" for signed AWS transports.'
+
+  option :region,
+         long: '--region REGION',
+         description: 'Region (necessary for AWS Transport)'
+
   option :types,
          description: 'Elasticsearch types to limit searches to, comma separated list.',
          long: '--types TYPES'
@@ -114,10 +124,9 @@ class ESQueryExists < Sensu::Plugin::Check::CLI
          boolean: true,
          default: false
 
-  option :query,
-         description: 'Elasticsearch query',
-         short: '-q QUERY',
-         long: '--query QUERY',
+  option :id,
+         description: 'ID of the ElasticSearch document to check for existence',
+         long: '--id ID',
          required: true
 
   option :host,
@@ -136,8 +145,7 @@ class ESQueryExists < Sensu::Plugin::Check::CLI
   option :scheme,
          description: 'Elasticsearch connection scheme, defaults to https for authenticated connections',
          short: '-s SCHEME',
-         long: '--scheme SCHEME',
-         default: 'https'
+         long: '--scheme SCHEME'
 
   option :password,
          description: 'Elasticsearch connection password',
@@ -157,28 +165,35 @@ class ESQueryExists < Sensu::Plugin::Check::CLI
          default: 30
 
   option :warn,
-         short: '-w N',
-         long: '--warn N',
-         description: 'Result count WARNING threshold',
-         proc: proc(&:to_i),
-         default: 0
-
-  option :crit,
-         short: '-c N',
-         long: '--crit N',
-         description: 'Result count CRITICAL threshold',
-         proc: proc(&:to_i),
-         default: 0
+         short: '-w',
+         long: '--warn',
+         description: 'Warn instead of critical',
+         boolean: true,
+         default: false
 
   option :invert,
          long: '--invert',
-         description: 'Invert thresholds',
-         boolean: true
+         description: 'Invert status',
+         boolean: true,
+         default: false
 
-    def run # rubocop:disable all
-      client.exists(build_request_options)
+  def run
+    if client.exists?(build_request_options)
+      if config[:invert]
+        if config[:warn]
+          warning
+        else
+          critical
+        end
+      else
+        ok
+      end
+    elsif config[:invert]
       ok
-    rescue Elasticsearch::Transport::Transport::Errors::NotFound
+    elsif config[:warn]
+      warning
+    else
       critical
     end
+  end
 end

data/bin/handler-es-delete-indices.rb

@@ -0,0 +1,99 @@
+#! /usr/bin/env ruby
+#
+#   handler-es-delete-indices.rb
+#
+# DESCRIPTION:
+#   This handler deletes indices.
+#
+# OUTPUT:
+#   plain text
+#
+# PLATFORMS:
+#   Linux
+#
+# DEPENDENCIES:
+#   gem: sensu-plugin
+#   gem: elasticsearch
+#   gem: aws_es_transport
+#
+# USAGE:
+#   Deletes the indices given to it from a check output and a configured
+#     regex, and then deletes the indices matched.
+#
+# NOTES:
+#
+# LICENSE:
+#   Brendan Leon Gibat <brendan.gibat@gmail.com>
+#   Released under the same terms as Sensu (the MIT license); see LICENSE
+#   for details.
+#
+
+require 'sensu-handler'
+require 'elasticsearch'
+require 'aws_es_transport'
+require 'sensu-plugins-elasticsearch'
+
+class ESIndexCleanup < Sensu::Handler
+  include ElasticsearchCommon
+
+  option :transport,
+         long: '--transport TRANSPORT',
+         description: 'Transport to use to communicate with ES. Use "AWS" for signed AWS transports.'
+
+  option :region,
+         long: '--region REGION',
+         description: 'Region (necessary for AWS Transport)'
+
+  option :host,
+         description: 'Elasticsearch host',
+         short: '-h HOST',
+         long: '--host HOST',
+         default: 'localhost'
+
+  option :port,
+         description: 'Elasticsearch port',
+         short: '-p PORT',
+         long: '--port PORT',
+         proc: proc(&:to_i),
+         default: 9200
+
+  option :scheme,
+         description: 'Elasticsearch connection scheme, defaults to https for authenticated connections',
+         short: '-s SCHEME',
+         long: '--scheme SCHEME'
+
+  option :password,
+         description: 'Elasticsearch connection password',
+         short: '-P PASSWORD',
+         long: '--password PASSWORD'
+
+  option :user,
+         description: 'Elasticsearch connection user',
+         short: '-u USER',
+         long: '--user USER'
+
+  option :timeout,
+         description: 'Elasticsearch query timeout in seconds',
+         short: '-t TIMEOUT',
+         long: '--timeout TIMEOUT',
+         proc: proc(&:to_i),
+         default: 60
+
+  option :event_regex,
+         description: 'Elasticsearch connection user',
+         short: '-e EVENT_REGEX',
+         long: '--event-regex EVENT_REGEX',
+         default: 'INDEX\[([^\]]+)\]'
+
+  def handle
+    event_regex = Regexp.new(config[:event_regex])
+    indices_to_delete = @event['check']['output'].scan(event_regex).flatten
+    if !indices_to_delete.nil? && !indices_to_delete.empty?
+
+      puts("Deleting indices: [ #{indices_to_delete.sort.join(', ')} ]")
+      client.indices.delete index: indices_to_delete
+    else
+      puts('No indices matched pattern to delete.')
+    end
+  end
+end

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

@@ -15,6 +15,7 @@
 #   Released under the same terms as Sensu (the MIT license); see LICENSE
 #   for details.
 #
+
 require_relative 'elasticsearch-query.rb'
 
 module ElasticsearchCommon
@@ -24,19 +25,24 @@ module ElasticsearchCommon
   end
 
   def client
-    @client ||= begin
-      if !config[:user].nil? && !config[:pass].nil? && !config[:scheme].nil?
-        Elasticsearch::Client.new hosts: [{
-          host:               config[:host],
-          port:               config[:port],
-          user:               config[:user],
-          password:           config[:password],
-          scheme:             config[:scheme],
-          request_timeout:    config[:timeout]
-        }]
-      else
-        Elasticsearch::Client.new host: "#{config[:host]}:#{config[:port]}", request_timeout: config[:timeout]
-      end
+    transport_class = nil
+    if config[:transport] == 'AWS'
+      transport_class = Elasticsearch::Transport::Transport::HTTP::AWS
     end
+
+    host = {
+      host:               config[:host],
+      port:               config[:port],
+      request_timeout:    config[:timeout],
+      scheme:             config[:scheme]
+    }
+
+    if !config[:user].nil? && !config[:password].nil?
+      host[:user] = config[:user]
+      host[:password] = config[:password]
+      host[:scheme] = 'https' unless config[:scheme]
+    end
+
+    @client ||= Elasticsearch::Client.new(transport_class: transport_class, hosts: [host], region: config[:region])
   end
 end

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

@@ -63,10 +63,19 @@ module ElasticsearchQuery
   def build_request_options
     end_time = (Time.now.utc - config[:offset])
     options = {
+
       index: indices(end_time),
       ignore_unavailable: true
     }
 
+    unless config[:ignore_unavailable].nil?
+      options[:ignore_unavailable] = config[:ignore_unavailable]
+    end
+
+    unless config[:id].nil?
+      options[:id] = config[:id]
+    end
+
     if !config[:body].nil?
       options[:body] = config[:body]
     else

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

@@ -1,8 +1,8 @@
 module SensuPluginsElasticsearch
   module Version
-    MAJOR = 0
-    MINOR = 5
-    PATCH = 3
+    MAJOR = 1
+    MINOR = 0
+    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: 0.5.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Sensu Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-02 00:00:00.000000000 Z
+date: 2016-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -28,170 +28,202 @@ dependencies:
   name: elasticsearch
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.14
+- !ruby/object:Gem::Dependency
+  name: aws-es-transport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !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.37'
+        version: 0.40.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.37'
+        version: 0.40.0
 - !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\n                              for
-  monitoring and metrics collection, including:\n                              service
-  health and metrics for cluster, node, and more."
-email: <sensu-users@googlegroups.com>
+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>"
 executables:
 - check-es-circuit-breakers.rb
+- check-es-cluster-health.rb
 - check-es-cluster-status.rb
 - check-es-file-descriptors.rb
 - check-es-heap.rb
 - check-es-indexes.rb
+- check-es-indices-sizes.rb
 - check-es-node-status.rb
 - check-es-query-count.rb
 - check-es-query-exists.rb
 - check-es-shard-allocation-status.rb
+- handler-es-delete-indices.rb
 - metrics-es-cluster.rb
 - metrics-es-node-graphite.rb
 - metrics-es-node.rb
@@ -202,14 +234,17 @@ files:
 - LICENSE
 - README.md
 - bin/check-es-circuit-breakers.rb
+- bin/check-es-cluster-health.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-indices-sizes.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/handler-es-delete-indices.rb
 - bin/metrics-es-cluster.rb
 - bin/metrics-es-node-graphite.rb
 - bin/metrics-es-node.rb
@@ -233,17 +268,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for elasticsearch